From 56dcf6e1f6bd804eb02ae70a339820d8ce6ce749 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 27 Jan 2019 19:01:17 -0500 Subject: [PATCH] qt5.qtwebengine: refactor to use lib.versionOlder --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 8184f025153..ddb82832337 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -43,7 +43,7 @@ qtModule { ( cd src/3rdparty/chromium; patchShebangs . ) '' # Patch Chromium build files - + optionalString (builtins.compareVersions qtCompatVersion "5.12" < 0) '' + + optionalString (lib.versionOlder qtCompatVersion "5.12") '' substituteInPlace ./src/3rdparty/chromium/build/common.gypi --replace /bin/echo ${coreutils}/bin/echo substituteInPlace ./src/3rdparty/chromium/v8/${if qt56 then "build" else "gypfiles"}/toolchain.gypi \ --replace /bin/echo ${coreutils}/bin/echo @@ -81,7 +81,7 @@ qtModule { '' # TODO remove when new Apple SDK is in - + (if builtins.compareVersions qtCompatVersion "5.11" < 0 then '' + + (if lib.versionOlder qtCompatVersion "5.11" then '' substituteInPlace src/3rdparty/chromium/base/mac/foundation_util.mm \ --replace "NSArray*" "NSArray*" substituteInPlace src/3rdparty/chromium/base/mac/sdk_forward_declarations.h \