public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libgsf: update, streamline dependencies, drop obsolete patch

Browse Source 
Tried to build some affected packages, seems OK.

Conflicts (buildNativeInputs):
	pkgs/development/libraries/libgsf/default.nix
This commit is contained in:
Vladimír Čunát 2013-02-04 23:31:10 +01:00
parent dbe8a69a36
commit bc1e83aa1c
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/libgsf/default.nix
View File

@ -1,26 +1,21 @@
{ fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2 { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
, gettext, intltool, bzip2, glib, python , python
, gnomeSupport ? true, gdk_pixbuf ? null }:
, gnome_vfs ? null, libbonobo ? null }:
assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != null with { inherit (stdenv.lib) optionals; };
&& glib != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libgsf-1.14.25"; name = "libgsf-1.14.25";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
sha256 = "127548f07e07951984fb139c3f89d65b9e471aefe6555387de03e1113944d1a2"; sha256 = "18ni8hwi3q83vs3m6mg6xwd4g7jvss4kz70kzf21k587gvq4hx8j";
}; };
nativeBuildInputs = [ intltool pkgconfig ]; nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = buildInputs = [ gettext bzip2 zlib python ];
[ perl perlXMLParser gettext bzip2 python ]
++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf ];
propagatedBuildInputs = [ libxml2 glib ] propagatedBuildInputs = [ libxml2 glib ];
++ stdenv.lib.optionals gnomeSupport [ libbonobo ];
doCheck = true; doCheck = true;

4
pkgs/top-level/all-packages.nix
View File

@ -4240,9 +4240,7 @@ let
libspectre = callPackage ../development/libraries/libspectre { }; libspectre = callPackage ../development/libraries/libspectre { };
libgsf = callPackage ../development/libraries/libgsf { libgsf = callPackage ../development/libraries/libgsf { };
inherit (gnome) gnome_vfs libbonobo;
};
libiconv = callPackage ../development/libraries/libiconv { }; libiconv = callPackage ../development/libraries/libiconv { };