1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-05 20:12:52 +00:00

libtiff: export private headers for freeimage

They are exported under the dev_private output so
that they aren't available automatically to dependening libraries.

This also switches to cmake to simplify the patch.
This commit is contained in:
Las 2021-01-03 19:26:08 +00:00
parent a4414f45b5
commit 96d50327bc
2 changed files with 27 additions and 3 deletions

View file

@ -2,6 +2,7 @@
, fetchurl
, pkgconfig
, cmake
, zlib
, libjpeg
@ -17,15 +18,25 @@ stdenv.mkDerivation rec {
sha256 = "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax";
};
outputs = [ "bin" "dev" "out" "man" "doc" ];
# FreeImage needs this patch
patches = [ ./headers.patch ];
nativeBuildInputs = [ pkgconfig ];
outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ];
postFixup = ''
moveToOutput include/tif_dir.h $dev_private
moveToOutput include/tif_config.h $dev_private
moveToOutput include/tiffiop.h $dev_private
'';
nativeBuildInputs = [ cmake pkgconfig ];
propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)
enableParallelBuilding = true;
doCheck = true; # not cross;
doInstallCheck = true;
installCheckTarget = "test";
meta = with stdenv.lib; {
description = "Library and utilities for working with the TIFF image file format";

View file

@ -0,0 +1,13 @@
diff -ruN a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
--- a/libtiff/CMakeLists.txt 2019-05-31 13:05:22.849705817 +0000
+++ b/libtiff/CMakeLists.txt 2020-11-27 21:50:03.527831837 +0000
@@ -42,6 +42,9 @@
libtiffxx.map)
set(tiff_HEADERS
+ tiffiop.h
+ ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h
+ tif_dir.h
tiff.h
tiffio.h
tiffvers.h)