qt515.qtwebkit: unbreak 🎉
A copy of #96309 essentially - fix the build of it with bison-3.7.
This commit is contained in:
parent
4dc0a9a0a7
commit
983465f13a
2 changed files with 11 additions and 6 deletions
|
@ -88,11 +88,17 @@ let
|
|||
})
|
||||
]
|
||||
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
|
||||
qtwebkit = [ ./qtwebkit.patch ]
|
||||
++ optionals stdenv.isDarwin [
|
||||
./qtwebkit-darwin-no-readline.patch
|
||||
./qtwebkit-darwin-no-qos-classes.patch
|
||||
];
|
||||
qtwebkit = [
|
||||
(fetchpatch {
|
||||
name = "qtwebkit-bison-3.7-build.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 ];
|
||||
};
|
||||
|
||||
|
|
|
@ -72,7 +72,6 @@ qtModule {
|
|||
preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
|
||||
|
||||
meta = {
|
||||
broken = lib.versionAtLeast qtbase.version "5.15";
|
||||
maintainers = with stdenv.lib.maintainers; [ abbradar periklis ];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue