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/top-level | |
parent | 362d75975045c185e67cb0b66baa43d4d5e337c4 (diff) | |
download | nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.gz nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.bz2 nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.lz nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.xz nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.zst nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.zip |
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/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8efb185bcdea..85988f8490b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6244,19 +6244,10 @@ let libgsf = callPackage ../development/libraries/libgsf { }; - libiconv = callPackage ../development/libraries/libiconv { }; - - libiconvOrEmpty = if libiconvOrNull == null then [] else [libiconv]; - - libiconvOrNull = - if stdenv.cc.libc or null != null || stdenv.isGlibc - then null - else libiconv; - - # The logic behind this attribute is broken: libiconvOrNull==null does - # NOT imply libiconv=glibc! On Darwin, for example, we have a native - # libiconv library which is not glibc. - libiconvOrLibc = if libiconvOrNull == null then stdenv.cc.libc else libiconv; + libiconv = + if stdenv.isGlibc + then stdenv.cc.libc + else callPackage ../development/libraries/libiconv { }; # On non-GNU systems we need GNU Gettext for libintl. libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext; |