skytemple, armips: fix compilation and remove indirectly vulnerable webkitgtk_4_0 (#449192)
This commit is contained in:
@@ -15839,7 +15839,7 @@
|
||||
githubId = 13599169;
|
||||
};
|
||||
marius851000 = {
|
||||
email = "mariusdavid@laposte.net";
|
||||
email = "nix@mariusdavid.fr";
|
||||
name = "Marius David";
|
||||
github = "marius851000";
|
||||
githubId = 22586596;
|
||||
|
||||
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail c++11 c++17
|
||||
--replace-fail c++11 c++17 \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.13)" # done by https://github.com/Kingcom/armips/commit/e1ed5bf0f4565250b98b0ddfb9112f15dc8e8e3b upstream, patch not directly compatible
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
gobject-introspection,
|
||||
gtk3,
|
||||
gtksourceview4,
|
||||
webkitgtk_4_0,
|
||||
wrapGAppsHook3,
|
||||
python3Packages,
|
||||
}:
|
||||
@@ -26,10 +25,11 @@ python3Packages.buildPythonApplication rec {
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gtksourceview4
|
||||
# webkitgtk is used for rendering interactive statistics graph which
|
||||
# can be seen by opening a ROM, entering Pokemon section, selecting
|
||||
# any Pokemon, and clicking Stats and Moves tab.
|
||||
webkitgtk_4_0
|
||||
# SkyTemple uses webkitgtk 4.0 which is depend on libsoup2, an
|
||||
# unmaintained library. Since it is optional, do not use it.
|
||||
# It is only used to add interactive monster XP curver, that
|
||||
# can alternatively be opened in the web browser (and is also
|
||||
# rendered in-app as non-interactive image)
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -28,6 +28,7 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "pybind11>=2.13.6, < 2.14" "pybind11" \
|
||||
--replace-fail "scikit-build-core>=0.10.7, < 0.11" "scikit-build-core"
|
||||
'';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user