From 30701417c84c4c81777245627e6ad5ee834cd644 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 22 Apr 2011 17:30:39 +0000 Subject: [PATCH] Bump libgweather to 2.30.3 svn path=/nixpkgs/trunk/; revision=26922 --- pkgs/desktops/gnome-2.28/default.nix | 2 +- .../gnome-2.28/desktop/libgweather/default.nix | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 69cb60629e5a..f92abf23c44a 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -222,7 +222,7 @@ pkgs.makeOverridable }; libgweather = import ./desktop/libgweather { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 libtasn1; + inherit (pkgs) stdenv fetchurl pkgconfig libxml2 libtasn1 nettle gmp; inherit (pkgs.gtkLibs) gtk; inherit intltool GConf libsoup; }; diff --git a/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix index 45aaf5c3d2fa..736857fca930 100644 --- a/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix +++ b/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix @@ -1,13 +1,14 @@ -{stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1}: +{stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1, nettle, gmp}: +#Is this really necessary? assert stdenv ? glibc; -stdenv.mkDerivation { - name = "libgweather-2.28.0"; +stdenv.mkDerivation rec { + name = "libgweather-2.30.3"; src = fetchurl { - url = mirror://gnome/sources/libgweather/2.28/libgweather-2.28.0.tar.bz2; - sha256 = "0m4ncqzf13037zvyihydif1asgp6pnzdkmx5qnmffzb1gd6qxzb5"; + url = "mirror://gnome/sources/libgweather/2.30/${name}.tar.bz2"; + sha256 = "0k16lpdyy8as8wgc5dqpy5b8i9i4mrl77qx8db23fgs2c533fddq"; }; configureFlags = "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo"; - buildInputs = [ pkgconfig libxml2 gtk intltool GConf libsoup libtasn1 ]; + buildInputs = [ pkgconfig libxml2 gtk intltool GConf libsoup libtasn1 nettle gmp ]; }