diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-24 11:57:44 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-24 11:57:44 +0100 |
| commit | 78b7529ee36603182ae34354d7cbc3dcfc228317 (patch) | |
| tree | 26a9555518aa403f9328dc1a72680e823e3630de /pkgs/tools/text | |
| parent | f3886a6fba7dec4d5c97a51558ab0a4489f89d76 (diff) | |
| parent | 4d4980d9f88956f533ecad905c92ab70f0e8cbad (diff) | |
| download | nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.gz nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.bz2 nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.lz nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.xz nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.zst nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/odt2txt/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/text/unrtf/default.nix | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix index b7134bf8e47c..85f0f24b3874 100644 --- a/pkgs/tools/text/odt2txt/default.nix +++ b/pkgs/tools/text/odt2txt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib }: +{ stdenv, fetchurl, zlib, libiconv }: stdenv.mkDerivation rec { name = "odt2txt-0.4"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { configurePhase="export makeFlags=\"DESTDIR=$out\""; - buildInputs = [ zlib ]; + buildInputs = [ zlib libiconv ]; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; meta = { description = "Simple .odt to .txt converter"; diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix index b1d8525c4da3..34eea38eb733 100644 --- a/pkgs/tools/text/unrtf/default.nix +++ b/pkgs/tools/text/unrtf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake }: +{ stdenv, fetchurl, autoconf, automake, libiconv }: stdenv.mkDerivation rec { name = "unrtf-${version}"; @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; + preConfigure = "./bootstrap"; outputs = [ "out" "man" ]; |