summary refs log tree commit diff
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2018-02-08 09:35:17 -0500
committerGitHub <noreply@github.com>2018-02-08 09:35:17 -0500
commita1383aa75f5ae1be792667262d04a148c99b07be (patch)
tree3e458a3bbad208e6310c4616271d9319d6a98c6f
parent6e782a0ef6c05ff2f72643fe49c58a226d9cf9bb (diff)
parent5fecc07932efd31581c5288931cc1ca2819441fc (diff)
downloadnixlib-a1383aa75f5ae1be792667262d04a148c99b07be.tar
nixlib-a1383aa75f5ae1be792667262d04a148c99b07be.tar.gz
nixlib-a1383aa75f5ae1be792667262d04a148c99b07be.tar.bz2
nixlib-a1383aa75f5ae1be792667262d04a148c99b07be.tar.lz
nixlib-a1383aa75f5ae1be792667262d04a148c99b07be.tar.xz
nixlib-a1383aa75f5ae1be792667262d04a148c99b07be.tar.zst
nixlib-a1383aa75f5ae1be792667262d04a148c99b07be.zip
Merge pull request #34571 from esoeylemez/ertes-slade
slade-git: init at 2018.01.29
-rw-r--r--pkgs/applications/misc/slade/git.nix26
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 30 insertions, 0 deletions
diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix
new file mode 100644
index 000000000000..29e01da1b5b1
--- /dev/null
+++ b/pkgs/applications/misc/slade/git.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }:
+
+stdenv.mkDerivation {
+  name = "slade-git-3.1.2.2018.01.29";
+
+  src = fetchFromGitHub {
+    owner = "sirjuddington";
+    repo = "SLADE";
+    rev = "f7409c504b40c4962f419038db934c32688ddd2e";
+    sha256 = "14icxiy0r9rlcc10skqs1ylnxm1f0f3irhzfmx4sazq0pjv5ivld";
+  };
+
+  cmakeFlags = ["-DNO_WEBVIEW=1"];
+  nativeBuildInputs = [ cmake pkgconfig zip ];
+  buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Doom editor";
+    homepage = http://slade.mancubus.net/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ertes ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27fb1595ba55..3f0a0abca793 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1903,6 +1903,10 @@ with pkgs;
     wxGTK = wxGTK30;
   };
 
+  sladeUnstable = callPackage ../applications/misc/slade/git.nix {
+    wxGTK = wxGTK30;
+  };
+
   drive = callPackage ../applications/networking/drive { };
 
   driftnet = callPackage ../tools/networking/driftnet {};