diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-02 14:06:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-02 14:06:03 +0100 |
| commit | 81693fc4b3cd591709e60924e6df035f6a4b51ed (patch) | |
| tree | 1bdbf3f6f5b4bf193f92284cb26ec640d3813ccf /pkgs/games/doom-ports | |
| parent | 2fa63bb5bd07df55e8c429e2db17b90153b14aed (diff) | |
| parent | 17783e08cd76e68051dbf4f838f93df4ebb590ff (diff) | |
Merge pull request #276565 from Gliczy/slade
slade: 3.2.4 -> 3.2.5; fix GIO related crashes; fix wayland
Diffstat (limited to 'pkgs/games/doom-ports')
| -rw-r--r-- | pkgs/games/doom-ports/slade/default.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/games/doom-ports/slade/default.nix b/pkgs/games/doom-ports/slade/default.nix index 9e9fc837e820a..9ab3d1f458d5d 100644 --- a/pkgs/games/doom-ports/slade/default.nix +++ b/pkgs/games/doom-ports/slade/default.nix @@ -15,21 +15,23 @@ , glew , lua , mpg123 +, wrapGAppsHook }: 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 = [ @@ -37,6 +39,7 @@ stdenv.mkDerivation rec { pkg-config which zip + wrapGAppsHook ]; buildInputs = [ @@ -54,10 +57,17 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DwxWidgets_LIBRARIES=${wxGTK}/lib" + "-DBUILD_PK3=ON" ]; env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + preFixup = '' + gappsWrapperArgs+=( + --prefix GDK_BACKEND : x11 + ) + ''; + meta = with lib; { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; |