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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
obadz
2016-08-24 11:57:44 +01:00
parent f3886a6fba 4d4980d9f8
commit 78b7529ee3
46 changed files with 363 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/text/odt2txt/default.nix
View File

@@ -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";

5
pkgs/tools/text/unrtf/default.nix
View File

@@ -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" ];