diff options
| author | Zaripov Kamil <zaripov-kamil@yandex-team.ru> | 2022-07-14 21:56:07 +0300 |
|---|---|---|
| committer | Zaripov Kamil <zaripov-kamil@yandex-team.ru> | 2022-07-30 12:22:19 +0300 |
| commit | 64f69cc3eb24e92ab87d92d5d0b297a6b2061c34 (patch) | |
| tree | afd4ba38a0e3d355b944a910d2da9725e20482e0 /pkgs/development/libraries/libtiff | |
| parent | 2ebaf53d611ff29ba18515026c929c5b4a9dc30d (diff) | |
libtiff: get rid of aarch64-darwin.nix
Diffstat (limited to 'pkgs/development/libraries/libtiff')
| -rw-r--r-- | pkgs/development/libraries/libtiff/aarch64-darwin.nix | 51 | ||||
| -rw-r--r-- | pkgs/development/libraries/libtiff/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libtiff/headers-cmake.patch | 13 |
3 files changed, 0 insertions, 66 deletions
diff --git a/pkgs/development/libraries/libtiff/aarch64-darwin.nix b/pkgs/development/libraries/libtiff/aarch64-darwin.nix deleted file mode 100644 index 521db8ff7993c..0000000000000 --- a/pkgs/development/libraries/libtiff/aarch64-darwin.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv -, fetchurl - -, pkg-config -, cmake - -, libdeflate -, libjpeg -, xz -, zlib -}: - -stdenv.mkDerivation rec { - pname = "libtiff"; - version = "4.2.0"; - - src = fetchurl { - url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; - sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b"; - }; - - # FreeImage needs this patch - patches = [ ./headers-cmake.patch ]; - - 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 pkg-config ]; - - propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection) - - buildInputs = [ libdeflate ]; # TODO: move all propagatedBuildInputs to buildInputs. - - enableParallelBuilding = true; - - doInstallCheck = true; - installCheckTarget = "test"; - - meta = with lib; { - description = "Library and utilities for working with the TIFF image file format"; - homepage = "https://libtiff.gitlab.io/libtiff"; - changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html"; - license = licenses.libtiff; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 4c7ea02d8aa4c..404a4004fd44b 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -21,8 +21,6 @@ , imlib }: -#FIXME: fix aarch64-darwin build and get rid of ./aarch64-darwin.nix - stdenv.mkDerivation rec { pname = "libtiff"; version = "4.4.0"; diff --git a/pkgs/development/libraries/libtiff/headers-cmake.patch b/pkgs/development/libraries/libtiff/headers-cmake.patch deleted file mode 100644 index 5a00502ef2818..0000000000000 --- a/pkgs/development/libraries/libtiff/headers-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -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) |