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

qt5.qtwebkit: fix build with bison-3.7

Browse Source
This commit is contained in:
Fabian Möller 2020-08-25 21:37:10 +02:00 committed by Peter Simons
parent 0daf71f97f
commit 77c720713d
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/qt-5/5.12/default.nix
View File

@ -101,11 +101,17 @@ let
./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
]; ];
qtwebkit = [ ./qtwebkit.patch ] qtwebkit = [
++ optionals stdenv.isDarwin [ (fetchpatch {
./qtwebkit-darwin-no-readline.patch name = "qtwebkit-bison-3.7-build.patch";
./qtwebkit-darwin-no-qos-classes.patch url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch";
]; sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
})
./qtwebkit.patch
] ++ optionals stdenv.isDarwin [
./qtwebkit-darwin-no-readline.patch
./qtwebkit-darwin-no-qos-classes.patch
];
qttools = [ ./qttools.patch ]; qttools = [ ./qttools.patch ];
}; };

16
pkgs/development/libraries/qt-5/5.14/default.nix
View File

@ -72,11 +72,17 @@ let
qtserialport = [ ./qtserialport.patch ]; qtserialport = [ ./qtserialport.patch ];
qtwebengine = [ ] qtwebengine = [ ]
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
qtwebkit = [ ./qtwebkit.patch ] qtwebkit = [
++ optionals stdenv.isDarwin [ (fetchpatch {
./qtwebkit-darwin-no-readline.patch name = "qtwebkit-bison-3.7-build.patch";
./qtwebkit-darwin-no-qos-classes.patch url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch";
]; sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
})
./qtwebkit.patch
] ++ optionals stdenv.isDarwin [
./qtwebkit-darwin-no-readline.patch
./qtwebkit-darwin-no-qos-classes.patch
];
qttools = [ ./qttools.patch ]; qttools = [ ./qttools.patch ];
}; };