diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-03 12:55:12 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-03 12:58:54 +0100 |
| commit | ed867a50eb89a90db3b1741bf4c0bf0cd4557dba (patch) | |
| tree | a95502fbc6cb68e944d1aa5202d024c97365b09c /pkgs/applications/networking/p2p/twister | |
| parent | 5b00625aa434205774d3e1cd43852ca1cbffc046 (diff) | |
| download | nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.gz nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.bz2 nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.lz nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.xz nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.zst nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.zip | |
iconv: remove usage on Linux in several packages
This fixes builds after #4419. Thanks to @vbgl for the original commit; I changed that as I'm not sure whether passing null values to buildInputs is clean. CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
Diffstat (limited to 'pkgs/applications/networking/p2p/twister')
| -rw-r--r-- | pkgs/applications/networking/p2p/twister/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 36f83a0611bf..13f6b2bcce4a 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python -, boost, db, openssl, geoip, libiconv, miniupnpc +, boost, db, openssl, geoip, libiconvOrEmpty, miniupnpc , srcOnly, fetchgit }: @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { buildInputs = [ autoconf automake libtool pkgconfig python - boost db openssl geoip libiconv miniupnpc - ]; + boost db openssl geoip miniupnpc + ] ++ libiconvOrEmpty; postPatch = '' sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \ |