From 7ff92cca4a69e52befe99615cf70c8aa9d213c9a Mon Sep 17 00:00:00 2001 From: Zack Grannan Date: Tue, 7 Aug 2018 21:36:26 +0800 Subject: [PATCH 1/5] skypeforlinux: add gsettings --- .../networking/instant-messengers/skypeforlinux/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 9ac3d870312d326..c7a6d1aa74ec65a 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -68,6 +68,8 @@ in stdenv.mkDerivation { inherit src; + nativeBuildInputs = [ gtk3 ]; + buildInputs = [ dpkg makeWrapper ]; unpackPhase = "true"; @@ -90,6 +92,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/ \ From daf214dd5adeae059c19480baf8e4373058abe76 Mon Sep 17 00:00:00 2001 From: Zack Grannan Date: Thu, 9 Aug 2018 20:55:26 +0800 Subject: [PATCH 2/5] Use wrapGAppsHook --- .../instant-messengers/skypeforlinux/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index c7a6d1aa74ec65a..1b89b6c206f7ac5 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 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, 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,7 @@ in stdenv.mkDerivation { inherit src; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ gtk3 wrapGAppsHook ]; buildInputs = [ dpkg makeWrapper ]; @@ -80,6 +80,8 @@ in stdenv.mkDerivation { rm -rf $out/opt $out/usr rm $out/bin/skypeforlinux + ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux" + # Otherwise it looks "suspicious" chmod -R g-w $out ''; @@ -90,12 +92,6 @@ in stdenv.mkDerivation { patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true done - 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/ \ From 7bc72899cb65cad2f4bf6eb319256dfc28eacf74 Mon Sep 17 00:00:00 2001 From: Zack Grannan Date: Sun, 12 Aug 2018 09:16:22 +0800 Subject: [PATCH 3/5] Move gtk3 to buildInputs --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 1b89b6c206f7ac5..46ca1371b00df07 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -68,9 +68,9 @@ in stdenv.mkDerivation { inherit src; - nativeBuildInputs = [ gtk3 wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ dpkg makeWrapper ]; + buildInputs = [ dpkg gtk3 makeWrapper ]; unpackPhase = "true"; installPhase = '' From 59fc5abcaf537d522aab359cdfc2029a4530f8cd Mon Sep 17 00:00:00 2001 From: Zack Grannan Date: Sun, 12 Aug 2018 18:08:48 +0800 Subject: [PATCH 4/5] remove makeWrapper --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 46ca1371b00df07..ae94415f57269ba 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, makeWrapper +{ stdenv, fetchurl, dpkg , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome3 , gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg }: @@ -70,7 +70,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ dpkg gtk3 makeWrapper ]; + buildInputs = [ dpkg gtk3 ]; unpackPhase = "true"; installPhase = '' From cd541bd929b619f4ea609210f234368601edc901 Mon Sep 17 00:00:00 2001 From: Zack Grannan Date: Sun, 12 Aug 2018 18:13:43 +0800 Subject: [PATCH 5/5] Use glib instead of gtk3 --- .../networking/instant-messengers/skypeforlinux/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index ae94415f57269ba..c05c348a5b6491b 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -68,9 +68,10 @@ in stdenv.mkDerivation { inherit src; - nativeBuildInputs = [ wrapGAppsHook ]; + # For setup hook populating GSETTINGS_SCHEMA_PATH + nativeBuildInputs = [ wrapGAppsHook glib ]; - buildInputs = [ dpkg gtk3 ]; + buildInputs = [ dpkg ]; unpackPhase = "true"; installPhase = ''