summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2017-08-30 01:54:33 +0200
committerGitHub <noreply@github.com>2017-08-30 01:54:33 +0200
commit06f9f9323cedc3bd21113098d8d573b9fb393119 (patch)
tree9075b454bc13009c715efbe4a6dc363bf0836e47
parentadca58c2e71079a8996a18705e83707017290b29 (diff)
parentb64f149ea981b2e90b8230d15936283820729333 (diff)
downloadnixlib-06f9f9323cedc3bd21113098d8d573b9fb393119.tar
nixlib-06f9f9323cedc3bd21113098d8d573b9fb393119.tar.gz
nixlib-06f9f9323cedc3bd21113098d8d573b9fb393119.tar.bz2
nixlib-06f9f9323cedc3bd21113098d8d573b9fb393119.tar.lz
nixlib-06f9f9323cedc3bd21113098d8d573b9fb393119.tar.xz
nixlib-06f9f9323cedc3bd21113098d8d573b9fb393119.tar.zst
nixlib-06f9f9323cedc3bd21113098d8d573b9fb393119.zip
Merge pull request #28683 from jtojnar/fix-gnome-disk-utility
gnome-disk-utility: fix missing schemas for gnome-disk-image-mounter
-rw-r--r--pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix14
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix
index f22f4665c142..aef58567387b 100644
--- a/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
-, bash, gtk3, glib, makeWrapper, cracklib, libnotify
-, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
+, bash, gtk3, glib, wrapGAppsHook, cracklib, libnotify
+, itstool, gnome3, gdk_pixbuf, libxml2, python
 , libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
 
 stdenv.mkDerivation rec {
@@ -16,14 +16,8 @@ stdenv.mkDerivation rec {
                   libxslt libtool libsecret libpwquality cracklib
                   libnotify libdvdread libcanberra_gtk3 docbook_xsl
                   gdk_pixbuf gnome3.defaultIconTheme
-                  librsvg udisks2 gnome3.gnome_settings_daemon
-                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-disks" \
-      --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"
-  '';
+                  udisks2 gnome3.gnome_settings_daemon
+                  gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ];
 
   meta = with stdenv.lib; {
     homepage = https://en.wikipedia.org/wiki/GNOME_Disks;