From 5b22f14d3818c7e20d349f2f399bf85d063413a7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 31 Oct 2021 11:58:38 -0500 Subject: [PATCH] qtbase: avoid rebuilding versions < 5.15 --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 53c55863f6f3..44f08699824f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation { sed -i '/PATHS.*NO_DEFAULT_PATH/ d' src/corelib/Qt5CoreMacros.cmake sed -i 's/NO_DEFAULT_PATH//' src/gui/Qt5GuiConfigExtras.cmake.in sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in - + '' + lib.optionalString (compareVersion "5.15.0" >= 0) '' patchShebangs ./bin '' + ( if stdenv.isDarwin then '' @@ -151,10 +151,8 @@ stdenv.mkDerivation { ''} NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\"" - - ${lib.optionalString (compareVersion "5.15.0" >= 0) '' + '' + lib.optionalString (compareVersion "5.15.0" >= 0) '' ./bin/syncqt.pl -version $version - ''} ''; postConfigure = ''