public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove libiconv hacks

Browse Source
This commit is contained in:
Matthew Bauer
2018-03-22 16:50:11 -05:00
parent ed2a9cf65f
commit 929f469ede
6 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/text/odt2txt/default.nix
-2
View File
@@ -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;
pkgs/tools/text/unrtf/default.nix
+1 -2
View File
@@ -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";