diff options
author | Gliczy <129636582+Gliczy@users.noreply.github.com> | 2024-01-23 15:00:03 +0100 |
---|---|---|
committer | Gliczy <129636582+Gliczy@users.noreply.github.com> | 2024-01-23 15:00:03 +0100 |
commit | 6ab5992b6f7fd627d73bb1b9064a259346c7ca39 (patch) | |
tree | f8db7594f63e5fd2356ffdd544f48255ec1dd156 /pkgs/games/doom-ports | |
parent | 4cf470c97cd9d78c31610fdf0806e402a3ffb667 (diff) |
slade: 3.2.4 -> 3.2.5
Remove the old `postPatch` for non-x86 systems as upstream implemented a check. Add fix for PK3 destination.
Diffstat (limited to 'pkgs/games/doom-ports')
-rw-r--r-- | pkgs/games/doom-ports/slade/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/games/doom-ports/slade/default.nix b/pkgs/games/doom-ports/slade/default.nix index 9e9fc837e820a..f55a778cbe3be 100644 --- a/pkgs/games/doom-ports/slade/default.nix +++ b/pkgs/games/doom-ports/slade/default.nix @@ -19,17 +19,18 @@ stdenv.mkDerivation rec { pname = "slade"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; rev = version; - sha256 = "sha256-CN01w+sXXRqvQqu1whePAb+phVx+VM8tL2NusfnCyF8="; + sha256 = "sha256-FBpf1YApwVpWSpUfa2LOrkS1Ef34sKCIZ6ic+Pczs14="; }; - postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) '' - sed -i '/-msse/d' src/CMakeLists.txt + postPatch = '' + substituteInPlace dist/CMakeLists.txt \ + --replace "PK3_OUTPUT" "PK3_DESTINATION" ''; nativeBuildInputs = [ @@ -54,6 +55,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DwxWidgets_LIBRARIES=${wxGTK}/lib" + "-DBUILD_PK3=ON" ]; env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; |