diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-11-09 15:36:08 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-11-09 15:36:08 -0500 |
| commit | aa08b8eb73e5904e66974d44ba4fbc2dbca5fe59 (patch) | |
| tree | d18a0c6b0bf90014263407bde4216417e57ba0ef /pkgs/development/libraries/qt-5 | |
| parent | 2472122bf39f2baf545bc113bda7b50681b7f138 (diff) | |
qt5.qtwebengine: remove dead conditions for pre 5.12 support
This doesn't change the derivation.
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 049b0349a4f8e..ff2b444ac2759 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -1,5 +1,5 @@ -{ qtModule, qtCompatVersion, - qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel +{ qtModule +, qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel , bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which @@ -54,14 +54,6 @@ qtModule { '' ( cd src/3rdparty/chromium; patchShebangs . ) '' - # Patch Chromium build files - + optionalString (lib.versionOlder qtCompatVersion "5.12") '' - substituteInPlace ./src/3rdparty/chromium/build/common.gypi --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/toolchain.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - '' # Prevent Chromium build script from making the path to `clang` relative to # the build directory. `clang_base_path` is the value of `QMAKE_CLANG_DIR` # from `src/core/config/mac_osx.pri`. @@ -91,10 +83,10 @@ qtModule { '' # Following is required to prevent a build error: # ninja: error: '/nix/store/z8z04p0ph48w22rqzx7ql67gy8cyvidi-SDKs/MacOSX10.12.sdk/usr/include/mach/exc.defs', needed by 'gen/third_party/crashpad/crashpad/util/mach/excUser.c', missing and no known rule to make it - + (optionalString (lib.versionAtLeast qtCompatVersion "5.11") '' + + '' substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ --replace '$sysroot/usr' "${darwin.xnu}" - '') + '' + '' # Apple has some secret stuff they don't share with OpenBSM substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ |