public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt5: 5.11 -> 5.12

Browse Source
This commit is contained in:
Bastian Köcher
2018-12-19 09:15:14 +01:00
committed by Frederik Rietdijk
parent 19f303a144
commit 8e811ec295
14 changed files with 1884 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+2 -3
View File
@@ -42,9 +42,8 @@ qtModule {
( cd src/3rdparty/chromium; patchShebangs . )
''
# Patch Chromium build files
+ ''
substituteInPlace ./src/3rdparty/chromium/build/common.gypi \
--replace /bin/echo ${coreutils}/bin/echo
+ optionalString (builtins.compareVersions qtCompatVersion "5.12" < 0) ''
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
substituteInPlace ./src/3rdparty/chromium/v8/${if qt56 then "build" else "gypfiles"}/standalone.gypi \