diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2017-08-28 23:27:04 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2017-08-29 13:29:04 +0200 |
commit | b64f149ea981b2e90b8230d15936283820729333 (patch) | |
tree | 961332fd0417e6036b59e08cb905df896dbd146a /pkgs/desktops | |
parent | 2858c41823db1654f123c455cca2b145b8d8737b (diff) | |
download | nixlib-b64f149ea981b2e90b8230d15936283820729333.tar nixlib-b64f149ea981b2e90b8230d15936283820729333.tar.gz nixlib-b64f149ea981b2e90b8230d15936283820729333.tar.bz2 nixlib-b64f149ea981b2e90b8230d15936283820729333.tar.lz nixlib-b64f149ea981b2e90b8230d15936283820729333.tar.xz nixlib-b64f149ea981b2e90b8230d15936283820729333.tar.zst nixlib-b64f149ea981b2e90b8230d15936283820729333.zip |
gnome-disk-utility: fix missing schemas for gnome-disk-image-mounter
Continuation of #28053 gnome-disk-image-mounter from gnome-disk-utility was not wrapped, resulting in an error due to the inability to find gsettings schemas. This commit replaces the manual wrapping of gnome-disks binary with wrapGAppsHook so that all binaries are wrapped correctly.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix | 14 |
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; |