diff options
author | William Casarin <bill@casarin.me> | 2016-06-14 16:37:37 -0700 |
---|---|---|
committer | William Casarin <bill@casarin.me> | 2016-06-16 20:02:49 -0700 |
commit | a34ec656594a01dcddc1e121f23d60b14aed835a (patch) | |
tree | a3764caf78f350a997246f4a2f9ef012648041a2 /pkgs/development/compilers/terra | |
parent | 552c2e5b089cb1c331452f1d2cc0eda006a801d6 (diff) |
terra: 2016-01-06 -> 2016-06-09
* llvmPackages_35 -> llvmPackages_38 * static llvm no longer needed * multiple outputs, this generates the following results: - out/lib/terra.so - bin/bin/terra - dev/include/terra/*.h - static/lib/libterra.a Contributed with help from @joachifm
Diffstat (limited to 'pkgs/development/compilers/terra')
-rw-r--r-- | pkgs/development/compilers/terra/default.nix | 49 |
1 files changed, 32 insertions, 17 deletions
diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 3586e4c32e5fd..4bee8ee4f357b 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -1,37 +1,52 @@ -{ stdenv, lua, fetchFromGitHub, fetchurl, which, llvm, clang, ncurses }: - -let luajitArchive = "LuaJIT-2.0.4.tar.gz"; - luajitSrc = fetchurl { - url = "http://luajit.org/download/${luajitArchive}"; - sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2"; - }; -in stdenv.mkDerivation rec { +{ stdenv, fetchFromGitHub, fetchurl, which, llvmPackages, ncurses, lua }: + +let + luajitArchive = "LuaJIT-2.0.4.tar.gz"; + luajitSrc = fetchurl { + url = "http://luajit.org/download/${luajitArchive}"; + sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2"; + }; +in + +stdenv.mkDerivation rec { name = "terra-git-${version}"; - version = "2016-01-06"; + version = "2016-06-09"; src = fetchFromGitHub { owner = "zdevito"; repo = "terra"; - rev = "914cb98b8adcd50b2ec8205ef5d6914d3547e281"; - sha256 = "1q0dm9gkx2lh2d2sfgly6j5nw32qigmlj3phdvjp26bz99cvxq46"; + rev = "22696f178be8597af555a296db804dba820638ba"; + sha256 = "1c2i9ih331304bh31c5gh94fx0qa49rsn70pvczvdfhi8pmcms6g"; }; - patchPhase = '' + outputs = [ "dev" "out" "bin" "static" ]; + + postPatch = '' substituteInPlace Makefile --replace \ '-lcurses' '-lncurses' ''; - configurePhase = '' + preBuild = '' mkdir -p build cp ${luajitSrc} build/${luajitArchive} ''; installPhase = '' - mkdir -p $out - cp -r "release/"* $out - ''; + mkdir -pv $out/lib + cp -v release/lib/terra.so $out/lib + + mkdir -pv $bin/bin + cp -v release/bin/terra $bin/bin + + mkdir -pv $static/lib + cp -v release/lib/libterra.a $static/lib + + mkdir -pv $dev/include + cp -rv release/include/terra $dev/include + '' + ; - buildInputs = [ which lua llvm clang ncurses ]; + buildInputs = with llvmPackages; [ which lua llvm clang-unwrapped ncurses ]; meta = with stdenv.lib; { inherit (src.meta) homepage; |