Merge pull request #456 from bjornfor/premake

premake: bump to version 4.3
This commit is contained in:
viric 2013-04-15 14:35:46 -07:00
commit d2d69902e8
4 changed files with 41 additions and 7 deletions

View file

@ -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}}

View file

@ -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;
};
}

View file

@ -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 = {

View file

@ -3309,7 +3309,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 { };