From 5049069a5cde3fcd165834b32fbfdc4a543b2bba Mon Sep 17 00:00:00 2001 From: Evils Date: Tue, 14 Nov 2023 06:36:06 +0100 Subject: [PATCH] slade, sladeUnstable: patch wxGTK to work with 3.2.4 --- pkgs/top-level/all-packages.nix | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6de74785d1c8..5ed360c16d2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37404,13 +37404,31 @@ with pkgs; rbdoom-3-bfg = callPackage ../games/doom-ports/rbdoom-3-bfg { }; slade = callPackage ../games/doom-ports/slade { - wxGTK = wxGTK32.override { + wxGTK = (wxGTK32.overrideAttrs { + patches = [ + (fetchpatch { # required to run slade 3.2.4 on wxGTK 3.2.4, see PR #266945 + url = "https://github.com/wxWidgets/wxWidgets/commit/425d9455e8307c1267a79d47d77e3dafeb4d86de.patch"; + excludes = [ "docs/changes.txt" ]; + revert = true; + hash = "sha256-6LOYLDLtVCHxNdHAWv3zhlCsljIpi//RJb9XVLGD5hM="; + }) + ]; + }).override { withWebKit = true; }; }; sladeUnstable = callPackage ../games/doom-ports/slade/git.nix { - wxGTK = wxGTK32.override { + wxGTK = (wxGTK32.overrideAttrs { + patches = [ + (fetchpatch { # required to run sladeUnstable unstable-2023-09-30 on wxGTK 3.2.4, see PR #266945 + url = "https://github.com/wxWidgets/wxWidgets/commit/425d9455e8307c1267a79d47d77e3dafeb4d86de.patch"; + excludes = [ "docs/changes.txt" ]; + revert = true; + hash = "sha256-6LOYLDLtVCHxNdHAWv3zhlCsljIpi//RJb9XVLGD5hM="; + }) + ]; + }).override { withWebKit = true; }; };