diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-01-27 19:01:17 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-01-27 19:01:17 -0500 |
| commit | 56dcf6e1f6bd804eb02ae70a339820d8ce6ce749 (patch) | |
| tree | 485c6994d98d01d92456099ad98f08e5e554ac74 /pkgs/development/libraries/qt-5 | |
| parent | ecbb9d36394ff094f2e5e566af4a1b7627f2f295 (diff) | |
| download | nixlib-56dcf6e1f6bd804eb02ae70a339820d8ce6ce749.tar nixlib-56dcf6e1f6bd804eb02ae70a339820d8ce6ce749.tar.gz nixlib-56dcf6e1f6bd804eb02ae70a339820d8ce6ce749.tar.bz2 nixlib-56dcf6e1f6bd804eb02ae70a339820d8ce6ce749.tar.lz nixlib-56dcf6e1f6bd804eb02ae70a339820d8ce6ce749.tar.xz nixlib-56dcf6e1f6bd804eb02ae70a339820d8ce6ce749.tar.zst nixlib-56dcf6e1f6bd804eb02ae70a339820d8ce6ce749.zip | |
qt5.qtwebengine: refactor to use lib.versionOlder
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 4 |
1 files 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 8184f0251530..ddb828323371 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<NSString*>*" "NSArray*" substituteInPlace src/3rdparty/chromium/base/mac/sdk_forward_declarations.h \ |