about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2017-04-04 11:38:47 +0200
committerJörg Thalheim <joerg@thalheim.io>2017-04-04 16:13:05 +0200
commitfccce068c397ff2e97a686babbb9604e4e88c20e (patch)
treede10302046e74d75e79927de6e50b674dbf90946 /pkgs/desktops
parent7d211be459ae80fca55c7eb50d79b5c6a7f9a9a3 (diff)
downloadnixlib-fccce068c397ff2e97a686babbb9604e4e88c20e.tar
nixlib-fccce068c397ff2e97a686babbb9604e4e88c20e.tar.gz
nixlib-fccce068c397ff2e97a686babbb9604e4e88c20e.tar.bz2
nixlib-fccce068c397ff2e97a686babbb9604e4e88c20e.tar.lz
nixlib-fccce068c397ff2e97a686babbb9604e4e88c20e.tar.xz
nixlib-fccce068c397ff2e97a686babbb9604e4e88c20e.tar.zst
nixlib-fccce068c397ff2e97a686babbb9604e4e88c20e.zip
baobab: remove superflous gsettings_desktop_schemas
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome-3/3.22/core/baobab/default.nix17
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix
index f7a0ff473cc1..15db270e80c5 100644
--- a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, intltool, fetchurl, vala_0_32, libgtop
+{ stdenv, intltool, fetchurl, vala, libgtop
 , pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libxml2
+, bash, wrapGAppsHook, itstool, libxml2
 , gnome3, librsvg, gdk_pixbuf, file }:
 
 stdenv.mkDerivation rec {
@@ -10,17 +10,8 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ vala_0_32 pkgconfig gtk3 glib libgtop intltool itstool libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/baobab" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
+  buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
+                  wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Baobab;