premake: bump to version 4.3

aacskeys depends on premake3, so keep that version around.

4 files changed, 41 insertions, 7 deletions

diff --git a/pkgs/development/libraries/aacskeys/default.nix b/pkgs/development/libraries/aacskeys/default.nix
index f791ea84f6b2..088f2cc4b1e0 100644
--- a/pkgs/development/libraries/aacskeys/default.nix
+++ b/pkgs/development/libraries/aacskeys/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl, jdk, premake}:
+{stdenv, fetchurl, openssl, jdk, premake3}:
 
 # Info on how to use / obtain aacs keys:
 # http://vlc-bluray.whoknowsmy.name/
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     sha256 = "0d3zvwixpkixfkkc16wj37h2xbcq5hsqqhqngzqr6pslmqr67vnr";
   };
 
-  buildInputs = [openssl jdk premake];
+  buildInputs = [openssl jdk premake3];
 
   installPhase = ''
     ensureDir $out/{bin,lib,share/${baseName}}
diff --git a/pkgs/development/tools/misc/premake/3.nix b/pkgs/development/tools/misc/premake/3.nix
new file mode 100644
index 000000000000..94a2880e1348
--- /dev/null
+++ b/pkgs/development/tools/misc/premake/3.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, unzip}:
+
+let baseName = "premake";
+  version  = "3.7";
+in
+
+stdenv.mkDerivation {
+  name = "${baseName}-${version}";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/sourceforge/premake/${baseName}-src-${version}.zip";
+    sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
+  };
+
+  buildInputs = [unzip];
+
+  installPhase = ''
+    install -Dm755 bin/premake $out/bin/premake
+  '';
+
+  meta = {
+    homepage = http://industriousone.com/premake;
+    description = "A simple build configuration and project generation tool using lua";
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix
index 4f534bd8664a..07896dd100f6 100644
--- a/pkgs/development/tools/misc/premake/default.nix
+++ b/pkgs/development/tools/misc/premake/default.nix
@@ -1,21 +1,25 @@
 {stdenv, fetchurl, unzip}:
 
 let baseName = "premake";
-    version  = "3.7";
+  version  = "4.3";
 in
 
 stdenv.mkDerivation {
   name = "${baseName}-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/sourceforge/premake/${baseName}-src-${version}.zip";
-    sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
+    url = "mirror://sourceforge/${baseName}/${baseName}-${version}-src.zip";
+    sha256 = "1017rd0wsjfyq2jvpjjhpszaa7kmig6q1nimw76qx3cjz2868lrn";
   };
 
   buildInputs = [unzip];
 
+  buildPhase = ''
+    make -C build/gmake.unix/
+  '';
+
   installPhase = ''
-    install -Dm755 bin/premake $out/bin/premake
+    install -Dm755 bin/release/premake4 $out/bin/premake4
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e299133f134..fa2d160d84b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3304,7 +3304,11 @@ let
   pkgconfig = forceNativeDrv (callPackage ../development/tools/misc/pkgconfig { });
   pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; });
 
-  premake = callPackage ../development/tools/misc/premake { };
+  premake3 = callPackage ../development/tools/misc/premake/3.nix { };
+
+  premake4 = callPackage ../development/tools/misc/premake { };
+
+  premake = premake4;
 
   pstack = callPackage ../development/tools/misc/gdb/pstack.nix { };