cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

libtiff: fix cross by switching back to autoconf

Browse source 
The CMake implementation seems to be very in flux, and the latest
release broke cross-compilation for us.  Autotools seems to be
upstream's recommended build system -- it's the one mentioned in the
README.
This commit is contained in:
Alyssa Ross 2021-07-09 10:27:28 +00:00
parent 666c01d977
commit 5df9305b60
2 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/libraries/libtiff/default.nix
View file

@ -1,8 +1,8 @@
{ lib, stdenv { lib, stdenv
, fetchurl , fetchurl
, autoreconfHook
, pkg-config , pkg-config
, cmake
, libdeflate , libdeflate
, libjpeg , libjpeg
@ -19,10 +19,6 @@ stdenv.mkDerivation rec {
sha256 = "1j3snghqjbhwmnm5vz3dr1zm68dj15mgbx1wqld7vkl7n2nfaihf"; sha256 = "1j3snghqjbhwmnm5vz3dr1zm68dj15mgbx1wqld7vkl7n2nfaihf";
}; };
cmakeFlags = if stdenv.isDarwin then [
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
] else null;
# FreeImage needs this patch # FreeImage needs this patch
patches = [ ./headers.patch ]; patches = [ ./headers.patch ];
@ -34,7 +30,9 @@ stdenv.mkDerivation rec {
moveToOutput include/tiffiop.h $dev_private moveToOutput include/tiffiop.h $dev_private
''; '';
nativeBuildInputs = [ cmake pkg-config ]; # If you want to change to a different build system, please make
# sure cross-compilation works first!
nativeBuildInputs = [ autoreconfHook pkg-config ];
propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection) propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection)
@ -42,8 +40,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
doInstallCheck = true; doCheck = true;
installCheckTarget = "test";
meta = with lib; { meta = with lib; {
description = "Library and utilities for working with the TIFF image file format"; description = "Library and utilities for working with the TIFF image file format";

26
pkgs/development/libraries/libtiff/headers.patch
View file

@ -1,14 +1,16 @@
diff --git i/libtiff/CMakeLists.txt w/libtiff/CMakeLists.txt diff --git i/libtiff/Makefile.am w/libtiff/Makefile.am
index 90105b28..340c75cf 100755 index 44522b62..d66e5948 100644
--- i/libtiff/CMakeLists.txt --- i/libtiff/Makefile.am
+++ w/libtiff/CMakeLists.txt +++ w/libtiff/Makefile.am
@@ -31,6 +31,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tiffconf.h.cmake.in @@ -36,8 +36,11 @@ EXTRA_DIST = \
@ONLY) tiffconf.h.cmake.in
set(tiff_public_HEADERS libtiffinclude_HEADERS = \
+ tiffiop.h + tif_config.h \
+ ${CMAKE_CURRENT_BINARY_DIR}/tif_config.h + tif_dir.h \
+ tif_dir.h tiff.h \
tiff.h tiffio.h \
tiffio.h + tiffiop.h \
tiffvers.h tiffvers.h
if HAVE_CXX