From 877a08b7d5b7a50779539d6d41b81c7a80162a5f Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Tue, 22 Mar 2016 13:39:27 -0300 Subject: gnome-calculator: refactor wrapping variables in binaries --- .../gnome-3/3.18/core/gnome-calculator/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'pkgs/desktops/gnome-3') diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix index 7ca66863d867..fef820010af9 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, libxml2 -, bash, gtk3, glib, makeWrapper +, bash, gtk3, glib, wrapGAppsHook , itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp }: stdenv.mkDerivation rec { @@ -9,16 +9,12 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ bash gtk3 glib intltool itstool libxml2 gnome3.gtksourceview mpfr gmp gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-calculator" \ - --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" - ''; + gnome3.gsettings_desktop_schemas gnome3.dconf ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/action/show/Apps/Calculator; -- cgit 1.4.1