diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-12-21 18:24:25 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-12-21 18:24:25 -0500 |
| commit | a30bff21e844be07f7f5389d0142a3f8751bc391 (patch) | |
| tree | f2a7d87e68326547568d0bea02a9e4e9cf73ef6c /pkgs/applications/science | |
| parent | b7e70092c5b8cd16b17a5027edb5cbef6eabbd86 (diff) | |
root: use llvm_5 from nixpkgs
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 0eb846a73a33..03b206973103 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, libX11 -, libXpm , libXft, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre, pkgconfig -, python , xxHash, zlib, zstd +{ stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, llvm_5 +, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre +, pkgconfig, python, xxHash, zlib, zstd , libAfterImage, giflib, libjpeg, libtiff, libpng , Cocoa, OpenGL, noSplash ? false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper cmake pkgconfig ]; - buildInputs = [ ftgl gl2ps glew pcre zlib zstd libxml2 lz4 lzma gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ] + buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 lzma gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_INCLUDEDIR=include" "-Dalien=OFF" "-Dbonjour=OFF" + "-Dbuiltin_llvm=OFF" "-Dcastor=OFF" "-Dchirp=OFF" "-Dclad=OFF" |