ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

terra: specify tool paths via Makefile.inc

Browse Source 
Judging by the build output, which doesn't find what it's looking for
anyway.
This commit is contained in:
Joachim Fasting 2016-06-23 01:21:15 +02:00
parent 9983937d1a
commit cd96d0c7d7
No known key found for this signature in database
GPG Key ID: 4330820E1E04DCF4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchurl, which, llvmPackages, ncurses, lua }:
{ stdenv, fetchFromGitHub, fetchurl, llvmPackages, ncurses, lua }:
let
luajitArchive = "LuaJIT-2.0.4.tar.gz";
@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
'';
preBuild = ''
cat >Makefile.inc<<EOF
CLANG = ${stdenv.lib.getBin llvmPackages.clang-unwrapped}/bin/clang
LLVM_CONFIG = ${stdenv.lib.getBin llvmPackages.llvm}/bin/llvm-config
EOF
mkdir -p build
cp ${luajitSrc} build/${luajitArchive}
'';
@ -50,7 +55,7 @@ stdenv.mkDerivation rec {
paxmark m $bin/bin/terra
'';
buildInputs = with llvmPackages; [ which lua llvm clang-unwrapped ncurses ];
buildInputs = with llvmPackages; [ lua llvm clang-unwrapped ncurses ];
meta = with stdenv.lib; {
inherit (src.meta) homepage;