mkXfceDerivation: add wrapGAppsHook

5 files changed, 6 insertions, 12 deletions

diff --git a/pkgs/desktops/xfce4-14/mkXfceDerivation.nix b/pkgs/desktops/xfce4-14/mkXfceDerivation.nix
index da7179c46462..cf4b5eb3cdc6 100644
--- a/pkgs/desktops/xfce4-14/mkXfceDerivation.nix
+++ b/pkgs/desktops/xfce4-14/mkXfceDerivation.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme }:
+{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, wrapGAppsHook }:
 
 { category, pname, version, rev ? "${pname}-${version}", sha256, ... } @ args:
 
@@ -15,7 +15,7 @@ let
   template = rec {
     name = "${pname}-${version}";
 
-    nativeBuildInputs = [ pkgconfig xfce4-dev-tools ];
+    nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ];
     buildInputs = [ hicolor-icon-theme ];
     configureFlags = [ "--enable-maintainer-mode" ];
 
diff --git a/pkgs/desktops/xfce4-14/parole/default.nix b/pkgs/desktops/xfce4-14/parole/default.nix
index b846c462713e..77e614b493b8 100644
--- a/pkgs/desktops/xfce4-14/parole/default.nix
+++ b/pkgs/desktops/xfce4-14/parole/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, makeWrapper, wrapGAppsHook, dbus, dbus-glib
+{ mkXfceDerivation, dbus, dbus-glib
 , gst-plugins-bad ? null, gst-plugins-base, gst-plugins-good
 , gst-plugins-ugly ? null, gtk3, libnotify, libxfce4ui, libxfce4util
 , taglib ? null, xfconf }:
@@ -17,8 +17,6 @@ mkXfceDerivation rec {
       --replace GST_BASE_CFLAGS GST_VIDEO_CFLAGS
   '';
 
-  nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
-
   buildInputs = [
     dbus
     dbus-glib
diff --git a/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
index 95af146903b1..0f74a78e8f2c 100644
--- a/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, wrapGAppsHook, glib-networking }:
+{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, glib-networking }:
 
 mkXfceDerivation rec {
   category = "apps";
@@ -7,6 +7,5 @@ mkXfceDerivation rec {
 
   sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06";
 
-  nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system"
   buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ];
 }
diff --git a/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
index 489656f96be9..e62332343ba7 100644
--- a/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
+++ b/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, gtk3, libxfce4ui, wrapGAppsHook, vte, xfconf }:
+{ mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf }:
 
 mkXfceDerivation rec {
   category = "apps";
@@ -8,7 +8,6 @@ mkXfceDerivation rec {
   sha256 = "0sg9vwyvhh7pjp83biv7gvf42423a7ly4dc7q2gn28kp6bds2qcp";
 
   buildInputs = [ gtk3 libxfce4ui vte xfconf ];
-  nativeBuildInputs = [ wrapGAppsHook ];
 
   meta = {
     description = "A modern terminal emulator";
diff --git a/pkgs/desktops/xfce4-14/xfdesktop/default.nix b/pkgs/desktops/xfce4-14/xfdesktop/default.nix
index ad70915337f9..32d0fb967720 100644
--- a/pkgs/desktops/xfce4-14/xfdesktop/default.nix
+++ b/pkgs/desktops/xfce4-14/xfdesktop/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, exo, wrapGAppsHook, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }:
+{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }:
 
 mkXfceDerivation rec {
   category = "xfce";
@@ -7,8 +7,6 @@ mkXfceDerivation rec {
 
   sha256 = "006w4xwmpwp34q2qkkixr3xz0vb0kny79pw64yj4304wsb5jr14g";
 
-  nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system"
-
   buildInputs = [
     exo
     gtk3