public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

terra: 2016-01-06 -> 2016-06-09

Browse Source 
* 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
This commit is contained in:
William Casarin 2016-06-14 16:37:37 -07:00
parent 552c2e5b08
commit a34ec65659
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pkgs/development/compilers/terra/default.nix
View File

@ -1,37 +1,52 @@
{ stdenv, lua, fetchFromGitHub, fetchurl, which, llvm, clang, ncurses }: { stdenv, fetchFromGitHub, fetchurl, which, llvmPackages, ncurses, lua }:
let luajitArchive = "LuaJIT-2.0.4.tar.gz"; let
luajitSrc = fetchurl { luajitArchive = "LuaJIT-2.0.4.tar.gz";
url = "http://luajit.org/download/${luajitArchive}"; luajitSrc = fetchurl {
sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2"; url = "http://luajit.org/download/${luajitArchive}";
}; sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2";
in stdenv.mkDerivation rec { };
in
stdenv.mkDerivation rec {
name = "terra-git-${version}"; name = "terra-git-${version}";
version = "2016-01-06"; version = "2016-06-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zdevito"; owner = "zdevito";
repo = "terra"; repo = "terra";
rev = "914cb98b8adcd50b2ec8205ef5d6914d3547e281"; rev = "22696f178be8597af555a296db804dba820638ba";
sha256 = "1q0dm9gkx2lh2d2sfgly6j5nw32qigmlj3phdvjp26bz99cvxq46"; sha256 = "1c2i9ih331304bh31c5gh94fx0qa49rsn70pvczvdfhi8pmcms6g";
}; };
patchPhase = '' outputs = [ "dev" "out" "bin" "static" ];
postPatch = ''
substituteInPlace Makefile --replace \ substituteInPlace Makefile --replace \
'-lcurses' '-lncurses' '-lcurses' '-lncurses'
''; '';
configurePhase = '' preBuild = ''
mkdir -p build mkdir -p build
cp ${luajitSrc} build/${luajitArchive} cp ${luajitSrc} build/${luajitArchive}
''; '';
installPhase = '' installPhase = ''
mkdir -p $out mkdir -pv $out/lib
cp -r "release/"* $out cp -v release/lib/terra.so $out/lib
'';
buildInputs = [ which lua llvm clang ncurses ]; 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 = with llvmPackages; [ which lua llvm clang-unwrapped ncurses ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
inherit (src.meta) homepage; inherit (src.meta) homepage;

3
pkgs/top-level/all-packages.nix
View File

@ -5361,8 +5361,7 @@ in
tbb = callPackage ../development/libraries/tbb { }; tbb = callPackage ../development/libraries/tbb { };
terra = callPackage ../development/compilers/terra { terra = callPackage ../development/compilers/terra {
llvm = llvmPackages_35.llvm.override { enableSharedLibraries = false; }; llvmPackages = llvmPackages_38;
clang = clang_35;
lua = lua5_1; lua = lua5_1;
}; };