From 35ddc19667d3e5c3d45308d464dc8fec8616426e Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Thu, 23 Sep 2021 03:05:54 -0700 Subject: [PATCH] libtiff: fix case-insensitive build --- .../development/libraries/libtiff/default.nix | 9 ++++++++- .../libraries/libtiff/rename-version.patch | 20 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libtiff/rename-version.patch diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 51c0d02def6c..6a3abe93b1b7 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -27,7 +27,14 @@ stdenv.mkDerivation rec { }; # FreeImage needs this patch - patches = [ ./headers.patch ]; + patches = [ + ./headers.patch + ./rename-version.patch + ]; + + postPatch = '' + mv VERSION VERSION.txt + ''; outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; diff --git a/pkgs/development/libraries/libtiff/rename-version.patch b/pkgs/development/libraries/libtiff/rename-version.patch new file mode 100644 index 000000000000..30601c0f04ee --- /dev/null +++ b/pkgs/development/libraries/libtiff/rename-version.patch @@ -0,0 +1,20 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -34,7 +34,7 @@ docfiles = \ + README.md \ + RELEASE-DATE \ + TODO \ +- VERSION ++ VERSION.txt + + EXTRA_DIST = \ + cmake \ +@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test man html + + release: + (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) +- (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) ++ (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) + (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) + + pkgconfigdir = $(libdir)/pkgconfig