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

kill libiconvOr*

Browse Source 
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Eric Seidel
2015-02-07 20:29:28 -08:00
parent 362d759750
commit e08b9ab8d3
37 changed files with 88 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libgsf/default.nix
+2 -3
View File
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
, python, gdk_pixbuf, libiconvOrEmpty, libintlOrEmpty }:
, python, gdk_pixbuf, libiconv, libintlOrEmpty }:
with { inherit (stdenv.lib) optionals; };
@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gettext bzip2 zlib python ];
propagatedBuildInputs = [ libxml2 glib gdk_pixbuf ]
++ libiconvOrEmpty
propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ]
++ libintlOrEmpty;
doCheck = true;