Unverified Commit 81693fc4 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #276565 from Gliczy/slade 

slade: 3.2.4 -> 3.2.5; fix GIO related crashes; fix wayland
parents 2fa63bb5 17783e08

pkgs/games/doom-ports/slade/default.nix

+14 −4
Original line number Diff line number Diff line
@@ -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/";