summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorWilliam Casarin <bill@casarin.me>2016-06-14 16:37:37 -0700
committerWilliam Casarin <bill@casarin.me>2016-06-16 20:02:49 -0700
commita34ec656594a01dcddc1e121f23d60b14aed835a (patch)
treea3764caf78f350a997246f4a2f9ef012648041a2 /pkgs/top-level
parent552c2e5b089cb1c331452f1d2cc0eda006a801d6 (diff)
downloadnixlib-a34ec656594a01dcddc1e121f23d60b14aed835a.tar
nixlib-a34ec656594a01dcddc1e121f23d60b14aed835a.tar.gz
nixlib-a34ec656594a01dcddc1e121f23d60b14aed835a.tar.bz2
nixlib-a34ec656594a01dcddc1e121f23d60b14aed835a.tar.lz
nixlib-a34ec656594a01dcddc1e121f23d60b14aed835a.tar.xz
nixlib-a34ec656594a01dcddc1e121f23d60b14aed835a.tar.zst
nixlib-a34ec656594a01dcddc1e121f23d60b14aed835a.zip
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/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf5d6273b08d..cf8d4e52d15b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5361,8 +5361,7 @@ in
   tbb = callPackage ../development/libraries/tbb { };
 
   terra = callPackage ../development/compilers/terra {
-    llvm = llvmPackages_35.llvm.override { enableSharedLibraries = false; };
-    clang = clang_35;
+    llvmPackages = llvmPackages_38;
     lua = lua5_1;
   };