b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Weijia Wang 2022-10-28 17:12:13 +02:00
parent fc377a4d1e
commit a299ef8103
2 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
pkgs/applications/misc/slade/git.nix
View file

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

4
pkgs/top-level/all-packages.nix
View file

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