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/apr-util/default.nix | |
| parent | 362d75975045c185e67cb0b66baa43d4d5e337c4 (diff) | |
| download | nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.gz nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.bz2 nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.lz nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.xz nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.zst nixpkgs-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/development/libraries/apr-util/default.nix')
| -rw-r--r-- | pkgs/development/libraries/apr-util/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 76477d38b6d..0f21af94c64 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -2,7 +2,7 @@ , sslSupport ? true, openssl , bdbSupport ? false, db , ldapSupport ? true, openldap -, libiconvOrNull +, libiconv }: assert sslSupport -> openssl != null; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString ldapSupport "--with-ldap"} ''; - propagatedBuildInputs = [ makeWrapper apr expat libiconvOrNull ] + propagatedBuildInputs = [ makeWrapper apr expat libiconv ] ++ optional sslSupport openssl ++ optional bdbSupport db ++ optional ldapSupport openldap; |