qt5: 5.14.2 -> 5.15.0

2020-07-24 19:26:29 -06:00
parent 5bfb3ea696
commit eb919fa712
24 changed files with 2289 additions and 5 deletions
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -295,7 +295,6 @@ stdenv.mkDerivation {
      "-make tools"
      ''-${lib.optionalString (!buildExamples) "no"}make examples''
      ''-${lib.optionalString (!buildTests) "no"}make tests''
-      "-v"
    ]

    ++ (
@@ -312,7 +311,6 @@ stdenv.mkDerivation {
        [
          "-${lib.optionalString (compareVersion "5.9.0" < 0) "no-"}rpath"

-          "-system-xcb"
          "-xcb"
          "-qpa xcb"
          "-L" "${libX11.out}/lib"
@@ -327,7 +325,6 @@ stdenv.mkDerivation {
          ''-${lib.optionalString (cups == null) "no-"}cups''
          "-dbus-linked"
          "-glib"
-          "-system-libjpeg"
          "-system-libpng"
        ]
        ++ lib.optional withGtk3 "-gtk"