diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-02-04 23:31:10 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-02-21 21:32:12 +0100 |
commit | bc1e83aa1c2d12c23b6939ae3cfc0ba75a988fd3 (patch) | |
tree | 03885bb4c969515a5700d4cacfcf48d1efb3d112 /pkgs/development/libraries/libgsf/default.nix | |
parent | dbe8a69a362a13cf3b097a699cb34c9e8f3a6ad5 (diff) |
libgsf: update, streamline dependencies, drop obsolete patch
Tried to build some affected packages, seems OK. Conflicts (buildNativeInputs): pkgs/development/libraries/libgsf/default.nix
Diffstat (limited to 'pkgs/development/libraries/libgsf/default.nix')
-rw-r--r-- | pkgs/development/libraries/libgsf/default.nix | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 56f6242c09e82..c6d46643ba972 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,26 +1,21 @@ -{ fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2 -, gettext, intltool, bzip2, glib, python -, gnomeSupport ? true, gdk_pixbuf ? null -, gnome_vfs ? null, libbonobo ? null }: +{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 +, python +}: -assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != null - && glib != null; +with { inherit (stdenv.lib) optionals; }; stdenv.mkDerivation rec { name = "libgsf-1.14.25"; src = fetchurl { url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "127548f07e07951984fb139c3f89d65b9e471aefe6555387de03e1113944d1a2"; + sha256 = "18ni8hwi3q83vs3m6mg6xwd4g7jvss4kz70kzf21k587gvq4hx8j"; }; - nativeBuildInputs = [ intltool pkgconfig ]; - buildInputs = - [ perl perlXMLParser gettext bzip2 python ] - ++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf ]; + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ gettext bzip2 zlib python ]; - propagatedBuildInputs = [ libxml2 glib ] - ++ stdenv.lib.optionals gnomeSupport [ libbonobo ]; + propagatedBuildInputs = [ libxml2 glib ]; doCheck = true; |