qtbase: Move libtiff dependency from qtbase to qtimageformats

chkno · FRidh · commit 4bac8a7a0098 · 2020-08-27T08:47:47.000+02:00
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -8,7 +8,7 @@
   darwin, libiconv,
 
   dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite,
-  libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff,
+  libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng,
   libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev,
   xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm,
   zlib,
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
       harfbuzz icu
 
       # Image formats
-      libjpeg libpng libtiff
+      libjpeg libpng
       (if compareVersion "5.9.0" < 0 then pcre16 else pcre2)
     ]
     ++ (
diff --git a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix
@@ -1,6 +1,7 @@
-{ qtModule, qtbase }:
+{ qtModule, qtbase, libtiff }:
 
 qtModule {
   name = "qtimageformats";
   qtInputs = [ qtbase ];
+  propagatedBuildInputs = [ libtiff ];
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`		`-{ qtModule, qtbase }:`
	`1`	`+{ qtModule, qtbase, libtiff }:`
`2`	`2`
`3`	`3`	`qtModule {`
`4`	`4`	`name = "qtimageformats";`
`5`	`5`	`qtInputs = [ qtbase ];`
	`6`	`+ propagatedBuildInputs = [ libtiff ];`
`6`	`7`	`}`