From 73fe63f13ef25b167d3b2c87f70e4d0400a87d75 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 18 May 2014 23:27:52 +0200 Subject: [PATCH] gnome-system-monitor: add 3.12.2 version and cleanup expr --- .../3.12/core/gnome-system-monitor/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix index 91fbe67957fe..622df1c5db21 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix @@ -3,33 +3,34 @@ , itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: stdenv.mkDerivation rec { - name = "gnome-system-monitor-3.10.2"; + name = "gnome-system-monitor-3.12.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/3.10/${name}.tar.xz"; - sha256 = "bd009e15672afe4ad3ebd7ed286cce79b9f76420fd39bc77a5826b29134b9db0"; + url = "mirror://gnome/sources/gnome-system-monitor/3.12/${name}.tar.xz"; + sha256 = "ba074e2157302d91d73b68e13207bf85452b84234e429b1ec9b9a7b1c70736d8"; }; doCheck = true; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; + propagatedBuildInputs = [ ]; buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 gtkmm3 libgtop makeWrapper + gdk_pixbuf gnome3.gnome_icon_theme librsvg + hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.gsettings_desktop_schemas ]; preFixup = '' wrapProgram "$out/bin/gnome-system-monitor" \ --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" ''; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-monitor/3.10/; + homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/; description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; maintainers = with maintainers; [ lethalman ]; license = licenses.gpl2;