diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-19 09:55:32 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-19 09:55:32 +0100 |
| commit | e343a85cfb67ebaabd507359128c908254ee329a (patch) | |
| tree | 41639c511e90c79bb0aaf2fa63904f33a325b947 /pkgs/development/compilers | |
| parent | 5f575e7339eeea6b58e8566357cc580713e0a30d (diff) | |
| parent | c4cad8cfa7ba1c66199e064c93fe3525e919cb82 (diff) | |
| download | nixlib-e343a85cfb67ebaabd507359128c908254ee329a.tar nixlib-e343a85cfb67ebaabd507359128c908254ee329a.tar.gz nixlib-e343a85cfb67ebaabd507359128c908254ee329a.tar.bz2 nixlib-e343a85cfb67ebaabd507359128c908254ee329a.tar.lz nixlib-e343a85cfb67ebaabd507359128c908254ee329a.tar.xz nixlib-e343a85cfb67ebaabd507359128c908254ee329a.tar.zst nixlib-e343a85cfb67ebaabd507359128c908254ee329a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/halide/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 44af8f4bf236..1d3b13937fc0 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -1,5 +1,5 @@ { llvmPackages, lib, fetchFromGitHub, cmake -, libpng, libjpeg, mesa_noglu, eigen3_3, openblas +, libpng, libjpeg, mesa_noglu, eigen, openblas }: let @@ -37,7 +37,7 @@ in llvmPackages.stdenv.mkDerivation { # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # to get a hint howto setup atlas instead of openblas - buildInputs = [ llvmPackages.llvm libpng libjpeg mesa_noglu eigen3_3 openblas ]; + buildInputs = [ llvmPackages.llvm libpng libjpeg mesa_noglu eigen openblas ]; nativeBuildInputs = [ cmake ]; |