diff options
| author | Thomas Tuegel <thomas.tuegel@runtimeverification.com> | 2020-09-05 16:22:24 -0500 |
|---|---|---|
| committer | Thomas Tuegel <thomas.tuegel@runtimeverification.com> | 2020-09-07 08:05:38 -0500 |
| commit | b3d72930d81aefd7964c7a7ad17a7d775592436d (patch) | |
| tree | b66b307818daa3a5e85d2d44557afa8c01adf0b3 /pkgs/development/libraries/qt-5 | |
| parent | d6a57a8f4d079d69b9160569cbf55a87067d1e36 (diff) | |
qtbase: Preserve configuration options on Qt < 5.15
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtbase.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 9e7d6ae4c2359..cc6e45e3ebde5 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -296,6 +296,7 @@ stdenv.mkDerivation { ''-${lib.optionalString (!buildExamples) "no"}make examples'' ''-${lib.optionalString (!buildTests) "no"}make tests'' ] + ++ lib.optional (compareVersion "5.15.0" < 0) "-v" ++ ( if stdenv.isDarwin @@ -310,7 +311,9 @@ stdenv.mkDerivation { else [ "-${lib.optionalString (compareVersion "5.9.0" < 0) "no-"}rpath" - + ] + ++ lib.optional (compareVersion "5.15.0" < 0) "-system-xcb" + ++ [ "-xcb" "-qpa xcb" "-L" "${libX11.out}/lib" @@ -325,6 +328,9 @@ stdenv.mkDerivation { ''-${lib.optionalString (cups == null) "no-"}cups'' "-dbus-linked" "-glib" + ] + ++ lib.optional (compareVersion "5.15.0" < 0) "-system-libjpeg" + ++ [ "-system-libpng" ] ++ lib.optional withGtk3 "-gtk" |