diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-14 14:17:05 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-22 16:50:11 -0500 |
| commit | 929f469ede271ada14b47cb62fe086710f952771 (patch) | |
| tree | 5b6485c5139660397bbb94d359fdf89d58e8b888 /pkgs/tools | |
| parent | ed2a9cf65fe2bf02bc3e7070ca4b124260d99585 (diff) | |
treewide: remove libiconv hacks
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/aescrypt/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/whois/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/odt2txt/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/unrtf/default.nix | 3 |
4 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index d11392599220b..d1125d572ee99 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; - meta = with stdenv.lib; { description = "Encrypt files with Advanced Encryption Standard (AES)"; homepage = https://www.aescrypt.com/; diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 48a3d1591fc97..4a40c32004077 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { for i in Makefile po/Makefile; do substituteInPlace $i --replace "prefix = /usr" "prefix = $out" done - '' + stdenv.lib.optionalString (stdenv.isDarwin || stdenv.hostPlatform.isMusl) '' - echo "whois_LDADD += -liconv" >> Makefile ''; makeFlags = [ "HAVE_ICONV=1" ]; diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix index 187a6526dc3c2..3feecdf4f53c8 100644 --- a/pkgs/tools/text/odt2txt/default.nix +++ b/pkgs/tools/text/odt2txt/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libiconv ]; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; - meta = { description = "Simple .odt to .txt converter"; homepage = http://stosberg.net/odt2txt; diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix index c1b4aa1cf2c6e..361b6782526b3 100644 --- a/pkgs/tools/text/unrtf/default.nix +++ b/pkgs/tools/text/unrtf/default.nix @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; + buildInputs = [ libiconv ]; preConfigure = "./bootstrap"; |