qt5.qtwebengine: don't override patches
in qtModule
This fixes darwin build.
Fixes: 90db9641
('qt5.qtwebengine: fix build with bison-3.7')
This commit is contained in:
parent
aa08b8eb73
commit
ee2501f124
@ -97,6 +97,15 @@ let
|
|||||||
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951";
|
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951";
|
||||||
sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am";
|
sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am";
|
||||||
})
|
})
|
||||||
|
|
||||||
|
# Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599
|
||||||
|
(fetchpatch {
|
||||||
|
name = "qtwebengine-bison-3.7-build.patch";
|
||||||
|
url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599";
|
||||||
|
sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy";
|
||||||
|
stripLen = 1;
|
||||||
|
extraPrefix = "src/3rdparty/";
|
||||||
|
})
|
||||||
] ++ optionals stdenv.isDarwin [
|
] ++ optionals stdenv.isDarwin [
|
||||||
./qtwebengine-darwin-no-platform-check.patch
|
./qtwebengine-darwin-no-platform-check.patch
|
||||||
./qtwebengine-darwin-fix-failed-static-assertion.patch
|
./qtwebengine-darwin-fix-failed-static-assertion.patch
|
||||||
|
@ -70,7 +70,16 @@ let
|
|||||||
qtdeclarative = [ ./qtdeclarative.patch ];
|
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||||
qtscript = [ ./qtscript.patch ];
|
qtscript = [ ./qtscript.patch ];
|
||||||
qtserialport = [ ./qtserialport.patch ];
|
qtserialport = [ ./qtserialport.patch ];
|
||||||
qtwebengine = [ ]
|
qtwebengine = [
|
||||||
|
# Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599
|
||||||
|
(fetchpatch {
|
||||||
|
name = "qtwebengine-bison-3.7-build.patch";
|
||||||
|
url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599";
|
||||||
|
sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy";
|
||||||
|
stripLen = 1;
|
||||||
|
extraPrefix = "src/3rdparty/";
|
||||||
|
})
|
||||||
|
]
|
||||||
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
|
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
|
||||||
qtwebkit = [
|
qtwebkit = [
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
|
@ -70,7 +70,16 @@ let
|
|||||||
qtdeclarative = [ ./qtdeclarative.patch ];
|
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||||
qtscript = [ ./qtscript.patch ];
|
qtscript = [ ./qtscript.patch ];
|
||||||
qtserialport = [ ./qtserialport.patch ];
|
qtserialport = [ ./qtserialport.patch ];
|
||||||
qtwebengine = [ ]
|
qtwebengine = [
|
||||||
|
# Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599
|
||||||
|
(fetchpatch {
|
||||||
|
name = "qtwebengine-bison-3.7-build.patch";
|
||||||
|
url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599";
|
||||||
|
sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy";
|
||||||
|
stripLen = 1;
|
||||||
|
extraPrefix = "src/3rdparty/";
|
||||||
|
})
|
||||||
|
]
|
||||||
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
|
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
|
||||||
qtwebkit = [ ./qtwebkit.patch ]
|
qtwebkit = [ ./qtwebkit.patch ]
|
||||||
++ optionals stdenv.isDarwin [
|
++ optionals stdenv.isDarwin [
|
||||||
|
@ -38,17 +38,6 @@ qtModule {
|
|||||||
# which cannot be set at the same time as -Wformat-security
|
# which cannot be set at the same time as -Wformat-security
|
||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ];
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599
|
|
||||||
(fetchpatch {
|
|
||||||
name = "qtwebengine-bison-3.7-build.patch";
|
|
||||||
url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599";
|
|
||||||
sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy";
|
|
||||||
stripLen = 1;
|
|
||||||
extraPrefix = "src/3rdparty/";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch =
|
postPatch =
|
||||||
# Patch Chromium build tools
|
# Patch Chromium build tools
|
||||||
''
|
''
|
||||||
|
Loading…
Reference in New Issue
Block a user