diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-27 01:14:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-27 01:14:09 +0200 |
| commit | fb59f27a4368b1436518f9f76c6e2e68f60b92a6 (patch) | |
| tree | a68c3ac03a7ea04fd4b756a9d3cabf2667896e62 /pkgs/development/libraries/libtiff/default.nix | |
| parent | 4dccb224c584194e964b5fbef5fe2cee28c57803 (diff) | |
| download | nixpkgs-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar nixpkgs-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar.gz nixpkgs-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar.bz2 nixpkgs-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar.lz nixpkgs-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar.xz nixpkgs-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.tar.zst nixpkgs-fb59f27a4368b1436518f9f76c6e2e68f60b92a6.zip | |
WIP: getting good
Diffstat (limited to 'pkgs/development/libraries/libtiff/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libtiff/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index aa4ac0a7922..55db7692ffd 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { sha256 = "0wj8d1iwk9vnpax2h29xqc2hwknxg3s0ay2d5pxkg59ihbifn6pa"; }; - outputs = [ "dev" "out" "bin" "doc" ]; - patchPhase = '' for p in ${patchDir}/*-{2013-4244,2012-4447,2012-4564,2013-1960,2013-1961,libjpeg-turbo}.patch; do patch -p1 < "$p" @@ -34,6 +32,9 @@ stdenv.mkDerivation rec { patch -p0 < ${patchDir}/${if stdenv.isDarwin then "tiff-4.0.3" else "*"}-tiff2pdf-colors.patch ''; # ^ sh on darwin seems not to expand globs in redirects, and I don't want to rebuild all again elsewhere + outputs = [ "dev" "out" "bin" "doc" ]; + buildInputs = [ stdenv.hookLib.multiout ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection) |