diff options
author | José Romildo Malaquias <malaquias@gmail.com> | 2016-03-22 13:37:37 -0300 |
---|---|---|
committer | José Romildo Malaquias <malaquias@gmail.com> | 2016-03-22 14:22:12 -0300 |
commit | e4d8d4d234597cd5bc92776b7119fef8a1c388e9 (patch) | |
tree | 55bba80bdc82d7d09dd2425b33453b5d6f80fd24 | |
parent | 768b9d852d32c8cf8ce439bda91276176cea6a7e (diff) | |
download | nixlib-e4d8d4d234597cd5bc92776b7119fef8a1c388e9.tar nixlib-e4d8d4d234597cd5bc92776b7119fef8a1c388e9.tar.gz nixlib-e4d8d4d234597cd5bc92776b7119fef8a1c388e9.tar.bz2 nixlib-e4d8d4d234597cd5bc92776b7119fef8a1c388e9.tar.lz nixlib-e4d8d4d234597cd5bc92776b7119fef8a1c388e9.tar.xz nixlib-e4d8d4d234597cd5bc92776b7119fef8a1c388e9.tar.zst nixlib-e4d8d4d234597cd5bc92776b7119fef8a1c388e9.zip |
evince: refactor wrapping variables in binaries
-rw-r--r-- | pkgs/desktops/gnome-3/3.18/core/evince/default.nix | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix index 3220e9060643..3229d10104da 100644 --- a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 , glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 -, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper +, poppler, ghostscriptX, djvulibre, libspectre, libsecret , wrapGAppsHook , librsvg, gobjectIntrospection , recentListSize ? null # 5 is not enough, allow passing a different number , supportXPS ? false # Open XML Paper Specification via libgxps @@ -9,13 +9,15 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ - pkgconfig intltool perl perlXMLParser libxml2 + intltool perl perlXMLParser libxml2 glib gtk3 pango atk gdk_pixbuf gobjectIntrospection itstool gnome3.adwaita-icon-theme gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas poppler ghostscriptX djvulibre libspectre - makeWrapper libsecret librsvg gnome3.adwaita-icon-theme + libsecret librsvg gnome3.adwaita-icon-theme gnome3.dconf ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; configureFlags = [ @@ -37,15 +39,6 @@ stdenv.mkDerivation rec { sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c ''; - preFixup = '' - # Tell Glib/GIO about the MIME info directory, which is used - # by `g_file_info_get_content_type ()'. - wrapProgram "$out/bin/evince" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - - ''; - doCheck = false; # would need pythonPackages.dogTail, which is missing meta = with stdenv.lib; { |