diff options
| author | Zack Grannan <zgrannan@gmail.com> | 2018-08-07 21:36:26 +0800 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-19 15:04:03 +0200 |
| commit | 3b2f3e59d148038632d7c2a96d78ab4442f57875 (patch) | |
| tree | 18ec96b3babc52baadaba679a03112ae6c759045 /pkgs/applications/networking/instant-messengers | |
| parent | ff0a1018089421d4feda04264d188af59ee3b6b7 (diff) | |
| download | nixlib-3b2f3e59d148038632d7c2a96d78ab4442f57875.tar nixlib-3b2f3e59d148038632d7c2a96d78ab4442f57875.tar.gz nixlib-3b2f3e59d148038632d7c2a96d78ab4442f57875.tar.bz2 nixlib-3b2f3e59d148038632d7c2a96d78ab4442f57875.tar.lz nixlib-3b2f3e59d148038632d7c2a96d78ab4442f57875.tar.xz nixlib-3b2f3e59d148038632d7c2a96d78ab4442f57875.tar.zst nixlib-3b2f3e59d148038632d7c2a96d78ab4442f57875.zip | |
skypeforlinux: add gsettings schemas
cherry-picked and squashed from https://github.com/NixOS/nixpkgs/pull/44652
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 5899ca92eb0c..9f46f9227ae4 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, dpkg, makeWrapper +{ stdenv, fetchurl, dpkg , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome2, gnome3 -, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }: +, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg }: let @@ -68,7 +68,12 @@ in stdenv.mkDerivation { inherit src; - buildInputs = [ dpkg makeWrapper ]; + nativeBuildInputs = [ + wrapGAppsHook + glib # For setup hook populating GSETTINGS_SCHEMA_PATH + ]; + + buildInputs = [ dpkg ]; unpackPhase = "true"; installPhase = '' @@ -90,6 +95,10 @@ in stdenv.mkDerivation { ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux" + wrapProgram $out/bin/skypeforlinux \ + --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + + # Fix the desktop link substituteInPlace $out/share/applications/skypeforlinux.desktop \ --replace /usr/bin/ $out/bin/ \ |