diff options
author | viric <viric@viric.name> | 2013-04-15 14:35:46 -0700 |
---|---|---|
committer | viric <viric@viric.name> | 2013-04-15 14:35:46 -0700 |
commit | d2d69902e89317e23fb859943a92c7cbcf8a9b6c (patch) | |
tree | 623f74c127be91ab6d2247debe03bd1400948ff9 /pkgs | |
parent | e60cb1713f85b8fba7034a04ee25c1fc95ce7636 (diff) | |
parent | 38c7d196ac51b7a73f289ae6acc1c43e4e21461c (diff) | |
download | nixlib-d2d69902e89317e23fb859943a92c7cbcf8a9b6c.tar nixlib-d2d69902e89317e23fb859943a92c7cbcf8a9b6c.tar.gz nixlib-d2d69902e89317e23fb859943a92c7cbcf8a9b6c.tar.bz2 nixlib-d2d69902e89317e23fb859943a92c7cbcf8a9b6c.tar.lz nixlib-d2d69902e89317e23fb859943a92c7cbcf8a9b6c.tar.xz nixlib-d2d69902e89317e23fb859943a92c7cbcf8a9b6c.tar.zst nixlib-d2d69902e89317e23fb859943a92c7cbcf8a9b6c.zip |
Merge pull request #456 from bjornfor/premake
premake: bump to version 4.3
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/aacskeys/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/misc/premake/3.nix | 26 | ||||
-rw-r--r-- | pkgs/development/tools/misc/premake/default.nix | 12 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
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 680ee200c849..1c524475fff9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |