From 4fc7fa9d1d852065ff70d291e9748c410583b367 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Tue, 22 Mar 2016 13:41:14 -0300 Subject: nautilus: refactor wrapping variables in binaries --- pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix index ff9f847d3cdd..e8fc41df9c07 100644 --- a/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix @@ -1,21 +1,15 @@ { stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif , gtk, gnome3, libunique, intltool, gobjectIntrospection -, libnotify, makeWrapper, exempi, librsvg, tracker }: +, libnotify, wrapGAppsHook, exempi, librsvg, tracker }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg - gnome3.gnome_desktop gnome3.adwaita-icon-theme - gnome3.gsettings_desktop_schemas libnotify makeWrapper tracker ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - preFixup = '' - wrapProgram "$out/bin/nautilus" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" \ - --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; + buildInputs = [ libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg + gnome3.gnome_desktop gnome3.adwaita-icon-theme + gnome3.gsettings_desktop_schemas gnome3.dconf libnotify tracker ]; patches = [ ./extension_dir.patch ]; -- cgit 1.4.1