From d558e5c090366f177f0eb59ab58a4353aad8c593 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:29:03 +0200 Subject: [PATCH] gnome-calculator: add 3.12.1 version and cleanup expr --- .../gnome-3/3.12/core/gnome-calculator/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix index 205961a91713..666032f56a73 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix @@ -3,27 +3,27 @@ , itstool, gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { - name = "gnome-calculator-3.10.2"; + name = "gnome-calculator-3.12.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/3.10/${name}.tar.xz"; - sha256 = "0gkddnk9x76895xrz0ps4yny36w62fhi459gwmxqqb9kx5934n1f"; + url = "mirror://gnome/sources/gnome-calculator/3.12/${name}.tar.xz"; + sha256 = "15a75bbe19f6d2280d864f0504f6fc5b1f148fea9738b5548b64b7b8c0c64740"; }; NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 gnome3.gtksourceview + gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.gsettings_desktop_schemas makeWrapper ]; preFixup = '' wrapProgram "$out/bin/gnome-calculator" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; meta = with stdenv.lib; {