slade-git: 3.1.2 -> 3.2.0
This commit is contained in:
parent
b4f6361646
commit
74e27e2236
|
@ -1,18 +1,36 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }:
|
{ lib, stdenv, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, pkg-config
|
||||||
|
, wxGTK
|
||||||
|
, sfml
|
||||||
|
, fluidsynth
|
||||||
|
, curl
|
||||||
|
, freeimage
|
||||||
|
, ftgl
|
||||||
|
, glew
|
||||||
|
, zip
|
||||||
|
, lua
|
||||||
|
, fmt
|
||||||
|
, mpg123
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "slade-git-3.1.2.2018.01.29";
|
name = "slade-git-3.2.0.2021.05.13";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sirjuddington";
|
owner = "sirjuddington";
|
||||||
repo = "SLADE";
|
repo = "SLADE";
|
||||||
rev = "f7409c504b40c4962f419038db934c32688ddd2e";
|
rev = "d2e249c89062a44c912a9b86951526edc8735ba0";
|
||||||
sha256 = "14icxiy0r9rlcc10skqs1ylnxm1f0f3irhzfmx4sazq0pjv5ivld";
|
sha256 = "08dsvx7m7c97jm8fxzivmi1fr47hj53y0lv57clqc35bh2gi62dg";
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = ["-DNO_WEBVIEW=1"];
|
cmakeFlags = [
|
||||||
|
"-DwxWidgets_CONFIG_EXECUTABLE=${wxGTK}/bin/wx-config"
|
||||||
|
"-DWX_GTK3=OFF"
|
||||||
|
"-DNO_WEBVIEW=1"
|
||||||
|
];
|
||||||
nativeBuildInputs = [ cmake pkg-config zip ];
|
nativeBuildInputs = [ cmake pkg-config zip ];
|
||||||
buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ];
|
buildInputs = [ wxGTK wxGTK.gtk sfml fluidsynth curl freeimage ftgl glew lua fmt mpg123 ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Doom editor";
|
description = "Doom editor";
|
||||||
|
|
Loading…
Reference in a new issue