public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtbase: Move libtiff dependency from qtbase to qtimageformats

Browse Source
This commit is contained in:
Chuck 2020-08-24 13:48:57 -07:00 committed by Frederik Rietdijk
parent e132216194
commit 4bac8a7a00
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/qt-5/modules/qtbase.nix
View File

@ -8,7 +8,7 @@
darwin, libiconv, darwin, libiconv,
dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite, 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, libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev,
xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm,
zlib, zlib,
@ -48,7 +48,7 @@ stdenv.mkDerivation {
harfbuzz icu harfbuzz icu
# Image formats # Image formats
libjpeg libpng libtiff libjpeg libpng
(if compareVersion "5.9.0" < 0 then pcre16 else pcre2) (if compareVersion "5.9.0" < 0 then pcre16 else pcre2)
] ]
++ ( ++ (

3
pkgs/development/libraries/qt-5/modules/qtimageformats.nix
View File

@ -1,6 +1,7 @@
{ qtModule, qtbase }: { qtModule, qtbase, libtiff }:
qtModule { qtModule {
name = "qtimageformats"; name = "qtimageformats";
qtInputs = [ qtbase ]; qtInputs = [ qtbase ];
propagatedBuildInputs = [ libtiff ];
} }