sladeUnstable: unstable-2021-05-13 -> unstable-2022-08-15

pkgs/applications/misc/slade/git.nix

@@ -3,43 +3,66 @@
 , fetchFromGitHub
 , cmake
 , pkg-config
+, which
+, zip
 , wxGTK
+, gtk3
 , sfml
 , fluidsynth
 , curl
 , freeimage
 , ftgl
 , glew
-, zip
 , lua
-, fmt
 , mpg123
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "slade";
-  version = "unstable-2021-05-13";
+  version = "unstable-2022-08-15";
 
   src = fetchFromGitHub {
     owner = "sirjuddington";
     repo = "SLADE";
-    rev = "d2e249c89062a44c912a9b86951526edc8735ba0";
-    sha256 = "08dsvx7m7c97jm8fxzivmi1fr47hj53y0lv57clqc35bh2gi62dg";
+    rev = "1a0d25eec54f9ca2eb3667676d93fb0b6b6aea26";
+    sha256 = "sha256-mtaJr4HJbp2UnzwaLq12V69DqPYDmSNqMGiuPpMlznI=";
   };
 
-  cmakeFlags = [
-    "-DwxWidgets_CONFIG_EXECUTABLE=${wxGTK}/bin/wx-config"
-    "-DWX_GTK3=OFF"
-    "-DNO_WEBVIEW=1"
+  postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) ''
+    sed -i '/-msse/d' src/CMakeLists.txt
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    which
+    zip
   ];
-  nativeBuildInputs = [ cmake pkg-config zip ];
-  buildInputs = [ wxGTK wxGTK.gtk sfml fluidsynth curl freeimage ftgl glew lua fmt mpg123 ];
+
+  buildInputs = [
+    wxGTK
+    gtk3
+    sfml
+    fluidsynth
+    curl
+    freeimage
+    ftgl
+    glew
+    lua
+    mpg123
+  ];
+
+  cmakeFlags = [
+    "-DwxWidgets_LIBRARIES=${wxGTK}/lib"
+  ];
+
+  NIX_CFLAGS_COMPILE = "-Wno-narrowing";
 
   meta = with lib; {
     description = "Doom editor";
     homepage = "http://slade.mancubus.net/";
     license = licenses.gpl2Plus;
-    platforms = [ "x86_64-linux" "i686-linux" ];
+    platforms = platforms.linux;
     maintainers = with maintainers; [ ertes ];
   };
 }

pkgs/top-level/all-packages.nix

@@ -5940,7 +5940,9 @@ with pkgs;
   };
 
   sladeUnstable = callPackage ../applications/misc/slade/git.nix {
-    wxGTK = wxGTK30;
+    wxGTK = wxGTK32.override {
+      withWebKit = true;
+    };
   };
 
   drive = callPackage ../applications/networking/drive { };