libtiff: don't propagate unnecessary build inputs

authored by Ivan Mincik and committed by philiptaron.tngl.sh 6b2e5b94 30a43d2f

+11 -16
+11 -16
pkgs/by-name/li/libtiff/package.nix
··· 16 zlib, 17 zstd, 18 19 - # Because lerc is C++ and static libraries don't track dependencies, 20 - # that every downstream dependent of libtiff has to link with a C++ 21 - # compiler, or the C++ standard library won't be linked, resulting 22 - # in undefined symbol errors. Without systematic support for this 23 - # in build systems, fixing this would require modifying the build 24 - # system of every libtiff user. Hopefully at some point build 25 # systems will figure this out, and then we can enable this. 26 # 27 # See https://github.com/mesonbuild/meson/issues/14234 ··· 84 ]; 85 86 buildInputs = [ 87 - zstd 88 - ] 89 - ++ lib.optionals withLerc [ 90 - lerc 91 - ]; 92 - 93 - # TODO: opengl support (bogus configure detection) 94 - propagatedBuildInputs = [ 95 libdeflate 96 libjpeg 97 - # libwebp depends on us; this will cause infinite 98 - # recursion otherwise 99 (libwebp.override { tiffSupport = false; }) 100 xz 101 zlib 102 zstd 103 ]; 104 105 cmakeFlags = [ ··· 109 enableParallelBuilding = true; 110 111 doCheck = true; 112 # Avoid flakiness like https://gitlab.com/libtiff/libtiff/-/commit/94f6f7315b1 113 enableParallelChecking = false; 114 ··· 122 openimageio 123 freeimage 124 ; 125 inherit (python3Packages) pillow imread; 126 pkg-config = testers.hasPkgConfigModules { 127 package = finalAttrs.finalPackage; 128 };
··· 16 zlib, 17 zstd, 18 19 + # Because lerc is C++ and static libraries don't track dependencies, every downstream dependent of 20 + # libtiff has to link with a C++ compiler, or the C++ standard library won't be linked, resulting 21 + # in undefined symbol errors. Without systematic support for this in build systems, fixing this 22 + # would require modifying the build system of every libtiff user. Hopefully at some point build 23 # systems will figure this out, and then we can enable this. 24 # 25 # See https://github.com/mesonbuild/meson/issues/14234 ··· 82 ]; 83 84 buildInputs = [ 85 libdeflate 86 libjpeg 87 + # libwebp depends on us; this will cause infinite recursion otherwise 88 (libwebp.override { tiffSupport = false; }) 89 xz 90 zlib 91 zstd 92 + ] 93 + ++ lib.optionals withLerc [ 94 + lerc 95 ]; 96 97 cmakeFlags = [ ··· 101 enableParallelBuilding = true; 102 103 doCheck = true; 104 + 105 # Avoid flakiness like https://gitlab.com/libtiff/libtiff/-/commit/94f6f7315b1 106 enableParallelChecking = false; 107 ··· 115 openimageio 116 freeimage 117 ; 118 + 119 inherit (python3Packages) pillow imread; 120 + 121 pkg-config = testers.hasPkgConfigModules { 122 package = finalAttrs.finalPackage; 123 };