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

qt515.qtwebkit: unbreak 🎉

Browse Source 
A copy of #96309 essentially - fix the build of it with bison-3.7.
This commit is contained in:
Doron Behar 2020-11-13 09:36:54 +02:00
parent 4dc0a9a0a7
commit 983465f13a
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,11 +88,17 @@ let
}) })
] ]
++ 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 ];
}; };

1
pkgs/development/libraries/qt-5/modules/qtwebkit.nix
View File

@ -72,7 +72,6 @@ qtModule {
preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
meta = { meta = {
broken = lib.versionAtLeast qtbase.version "5.15";
maintainers = with stdenv.lib.maintainers; [ abbradar periklis ]; maintainers = with stdenv.lib.maintainers; [ abbradar periklis ];
}; };
} }