slade: 3.1.1.5 -> 3.2.1
This commit is contained in:
parent
06b989a41c
commit
fc377a4d1e
|
@ -1,24 +1,68 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, which
|
||||
, zip
|
||||
, wxGTK
|
||||
, gtk3
|
||||
, sfml
|
||||
, fluidsynth
|
||||
, curl
|
||||
, freeimage
|
||||
, ftgl
|
||||
, glew
|
||||
, lua
|
||||
, mpg123
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "slade";
|
||||
version = "3.1.1.5";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sirjuddington";
|
||||
repo = "SLADE";
|
||||
rev = version;
|
||||
sha256 = "0mdn59jm6ab4cdh99bgvadif3wdlqmk5mq635gg7krq35njgw6f6";
|
||||
sha256 = "sha256-KFRX3sfI//Op/h/EfEuAZOY22RO5qNXmvhSksC0aS4U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config zip ];
|
||||
buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ];
|
||||
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_LIBRARIES=${wxGTK}/lib"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-narrowing";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Doom editor";
|
||||
homepage = "http://slade.mancubus.net/";
|
||||
license = licenses.gpl2;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5934,7 +5934,9 @@ with pkgs;
|
|||
sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { };
|
||||
|
||||
slade = callPackage ../applications/misc/slade {
|
||||
wxGTK = wxGTK30;
|
||||
wxGTK = wxGTK32.override {
|
||||
withWebKit = true;
|
||||
};
|
||||
};
|
||||
|
||||
sladeUnstable = callPackage ../applications/misc/slade/git.nix {
|
||||
|
|
Loading…
Reference in a new issue