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/text | |
parent | ed2a9cf65fe2bf02bc3e7070ca4b124260d99585 (diff) | |
download | nixlib-929f469ede271ada14b47cb62fe086710f952771.tar nixlib-929f469ede271ada14b47cb62fe086710f952771.tar.gz nixlib-929f469ede271ada14b47cb62fe086710f952771.tar.bz2 nixlib-929f469ede271ada14b47cb62fe086710f952771.tar.lz nixlib-929f469ede271ada14b47cb62fe086710f952771.tar.xz nixlib-929f469ede271ada14b47cb62fe086710f952771.tar.zst nixlib-929f469ede271ada14b47cb62fe086710f952771.zip |
treewide: remove libiconv hacks
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/odt2txt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/unrtf/default.nix | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix index 187a6526dc3c..3feecdf4f53c 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 c1b4aa1cf2c6..361b6782526b 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"; |