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

qtbase: Preserve configuration options on Qt < 5.15

Browse Source
This commit is contained in:
Thomas Tuegel 2020-09-05 16:22:24 -05:00
parent d6a57a8f4d
commit b3d72930d8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,6 +296,7 @@ stdenv.mkDerivation {
''-${lib.optionalString (!buildExamples) "no"}make examples'' ''-${lib.optionalString (!buildExamples) "no"}make examples''
''-${lib.optionalString (!buildTests) "no"}make tests'' ''-${lib.optionalString (!buildTests) "no"}make tests''
] ]
++ lib.optional (compareVersion "5.15.0" < 0) "-v"
++ ( ++ (
if stdenv.isDarwin if stdenv.isDarwin
@ -310,7 +311,9 @@ stdenv.mkDerivation {
else else
[ [
"-${lib.optionalString (compareVersion "5.9.0" < 0) "no-"}rpath" "-${lib.optionalString (compareVersion "5.9.0" < 0) "no-"}rpath"
]
++ lib.optional (compareVersion "5.15.0" < 0) "-system-xcb"
++ [
"-xcb" "-xcb"
"-qpa xcb" "-qpa xcb"
"-L" "${libX11.out}/lib" "-L" "${libX11.out}/lib"
@ -325,6 +328,9 @@ stdenv.mkDerivation {
''-${lib.optionalString (cups == null) "no-"}cups'' ''-${lib.optionalString (cups == null) "no-"}cups''
"-dbus-linked" "-dbus-linked"
"-glib" "-glib"
]
++ lib.optional (compareVersion "5.15.0" < 0) "-system-libjpeg"
++ [
"-system-libpng" "-system-libpng"
] ]
++ lib.optional withGtk3 "-gtk" ++ lib.optional withGtk3 "-gtk"