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/libtorrent-rasterbar | |
| 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/libtorrent-rasterbar')
| -rw-r--r-- | pkgs/development/libraries/libtorrent-rasterbar/generic.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix index f47ff1081bc..b866f66dbfa 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python, libiconvOrNull, geoip +{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python, libiconv, geoip # Version specific options , version, sha256 , ... }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - buildInputs = [ boost pkgconfig openssl zlib python libiconvOrNull geoip ]; + buildInputs = [ boost pkgconfig openssl zlib python libiconv geoip ]; configureFlags = [ "--enable-python-binding" @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { "--with-libiconv=yes" "--with-boost=${boost.dev}" "--with-boost-libdir=${boost.lib}/lib" - ] ++ stdenv.lib.optional (libiconvOrNull != null) "--with-libiconv=yes"; + "--with-libiconv=yes" + ]; meta = with stdenv.lib; { homepage = http://www.rasterbar.com/products/libtorrent/; |