diff options
author | Eric Seidel <gridaphobe@gmail.com> | 2014-11-26 15:16:50 -0800 |
---|---|---|
committer | Eric Seidel <gridaphobe@gmail.com> | 2015-02-07 20:29:28 -0800 |
commit | e08b9ab8d3d6362c774a786797347fa7483af773 (patch) | |
tree | f64e5ce1224cb2cb8d5cfa0840bbb86daa68ecc3 /pkgs/development/libraries/libgsf/default.nix | |
parent | 362d75975045c185e67cb0b66baa43d4d5e337c4 (diff) |
kill libiconvOr*
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
Diffstat (limited to 'pkgs/development/libraries/libgsf/default.nix')
-rw-r--r-- | pkgs/development/libraries/libgsf/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index dbcdabc895106..0479343a8f555 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -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; |