diff options
author | Joachim Fasting <joachifm@fastmail.fm> | 2016-06-23 01:21:15 +0200 |
---|---|---|
committer | Joachim Fasting <joachifm@fastmail.fm> | 2016-06-23 01:31:23 +0200 |
commit | cd96d0c7d7b7d876a1732ed868fb9515fec2a0f4 (patch) | |
tree | c206b1a167fe0f073b1175ef1ab20064cd03fdab /pkgs/development | |
parent | 9983937d1a14ecceb03ae4021583b5a7503401ba (diff) | |
download | nixlib-cd96d0c7d7b7d876a1732ed868fb9515fec2a0f4.tar nixlib-cd96d0c7d7b7d876a1732ed868fb9515fec2a0f4.tar.gz nixlib-cd96d0c7d7b7d876a1732ed868fb9515fec2a0f4.tar.bz2 nixlib-cd96d0c7d7b7d876a1732ed868fb9515fec2a0f4.tar.lz nixlib-cd96d0c7d7b7d876a1732ed868fb9515fec2a0f4.tar.xz nixlib-cd96d0c7d7b7d876a1732ed868fb9515fec2a0f4.tar.zst nixlib-cd96d0c7d7b7d876a1732ed868fb9515fec2a0f4.zip |
terra: specify tool paths via Makefile.inc
Judging by the build output, which doesn't find what it's looking for anyway.
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/terra/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 5af7bf464262..7cb3dddd5eb1 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -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; |