Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15826,7 +15826,7 @@
githubId = 13599169;
};
marius851000 = {
email = "mariusdavid@laposte.net";
email = "nix@mariusdavid.fr";
name = "Marius David";
github = "marius851000";
githubId = 22586596;
Expand Down
3 changes: 2 additions & 1 deletion pkgs/by-name/ar/armips/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down
10 changes: 5 additions & 5 deletions pkgs/by-name/sk/skytemple/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
gobject-introspection,
gtk3,
gtksourceview4,
webkitgtk_4_0,
wrapGAppsHook3,
python3Packages,
}:
Expand All @@ -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 = [
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/python-modules/explorerscript/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
'';

Expand Down
Loading