diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-10-28 17:12:13 +0200 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2022-10-28 22:22:55 +0200 |
| commit | a299ef810357d5556a15da53f16de2e95ea1aab9 (patch) | |
| tree | b594bb4d0a139057b16d13a35dae98c75b4344bb | |
| parent | fc377a4d1e0c5f3f9165d49b8281262ef1b97541 (diff) | |
| download | nixpkgs-a299ef810357d5556a15da53f16de2e95ea1aab9.tar nixpkgs-a299ef810357d5556a15da53f16de2e95ea1aab9.tar.gz nixpkgs-a299ef810357d5556a15da53f16de2e95ea1aab9.tar.bz2 nixpkgs-a299ef810357d5556a15da53f16de2e95ea1aab9.tar.lz nixpkgs-a299ef810357d5556a15da53f16de2e95ea1aab9.tar.xz nixpkgs-a299ef810357d5556a15da53f16de2e95ea1aab9.tar.zst nixpkgs-a299ef810357d5556a15da53f16de2e95ea1aab9.zip | |
sladeUnstable: unstable-2021-05-13 -> unstable-2022-08-15
| -rw-r--r-- | pkgs/applications/misc/slade/git.nix | 47 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 38 insertions, 13 deletions
diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix index 124ae206c8c..d336d460d7c 100644 --- a/pkgs/applications/misc/slade/git.nix +++ b/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="; }; + postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) '' + sed -i '/-msse/d' src/CMakeLists.txt + ''; + + nativeBuildInputs = [ + cmake + pkg-config + which + zip + ]; + + buildInputs = [ + wxGTK + gtk3 + sfml + fluidsynth + curl + freeimage + ftgl + glew + lua + mpg123 + ]; + cmakeFlags = [ - "-DwxWidgets_CONFIG_EXECUTABLE=${wxGTK}/bin/wx-config" - "-DWX_GTK3=OFF" - "-DNO_WEBVIEW=1" + "-DwxWidgets_LIBRARIES=${wxGTK}/lib" ]; - nativeBuildInputs = [ cmake pkg-config zip ]; - buildInputs = [ wxGTK wxGTK.gtk sfml fluidsynth curl freeimage ftgl glew lua fmt mpg123 ]; + + 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 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c8c1c26cd7..4e2ba4c2804 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { }; |