diff --git a/pkgs/by-name/li/libappimage/package.nix b/pkgs/by-name/li/libappimage/package.nix index 8d2a1013aff8..9e63c725c93b 100644 --- a/pkgs/by-name/li/libappimage/package.nix +++ b/pkgs/by-name/li/libappimage/package.nix @@ -16,6 +16,7 @@ librsvg, squashfuse, xdg-utils-cxx, + xz, # for liblzma zlib, }: stdenv.mkDerivation rec { @@ -66,6 +67,7 @@ stdenv.mkDerivation rec { libarchive squashfuse xdg-utils-cxx + xz ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/li/libgeotiff/package.nix b/pkgs/by-name/li/libgeotiff/package.nix index a8adeb40a962..30d1a94372a1 100644 --- a/pkgs/by-name/li/libgeotiff/package.nix +++ b/pkgs/by-name/li/libgeotiff/package.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtiff proj + zlib ]; #hardeningDisable = [ "format" ]; diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix index c73dfa2d0c94..33bfd037d577 100644 --- a/pkgs/by-name/li/libtiff/package.nix +++ b/pkgs/by-name/li/libtiff/package.nix @@ -16,12 +16,10 @@ zlib, zstd, - # Because lerc is C++ and static libraries don't track dependencies, - # that every downstream dependent of libtiff has to link with a C++ - # compiler, or the C++ standard library won't be linked, resulting - # in undefined symbol errors. Without systematic support for this - # in build systems, fixing this would require modifying the build - # system of every libtiff user. Hopefully at some point build + # Because lerc is C++ and static libraries don't track dependencies, every downstream dependent of + # libtiff has to link with a C++ compiler, or the C++ standard library won't be linked, resulting + # in undefined symbol errors. Without systematic support for this in build systems, fixing this + # would require modifying the build system of every libtiff user. Hopefully at some point build # systems will figure this out, and then we can enable this. # # See https://github.com/mesonbuild/meson/issues/14234 @@ -84,22 +82,16 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - zstd - ] - ++ lib.optionals withLerc [ - lerc - ]; - - # TODO: opengl support (bogus configure detection) - propagatedBuildInputs = [ libdeflate libjpeg - # libwebp depends on us; this will cause infinite - # recursion otherwise + # libwebp depends on us; this will cause infinite recursion otherwise (libwebp.override { tiffSupport = false; }) xz zlib zstd + ] + ++ lib.optionals withLerc [ + lerc ]; cmakeFlags = [ @@ -109,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; doCheck = true; + # Avoid flakiness like https://gitlab.com/libtiff/libtiff/-/commit/94f6f7315b1 enableParallelChecking = false; @@ -122,7 +115,9 @@ stdenv.mkDerivation (finalAttrs: { openimageio freeimage ; + inherit (python3Packages) pillow imread; + pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };