public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

root: use llvm_5 from nixpkgs

Browse Source
This commit is contained in:
Dmitry Kalinkin 2020-12-21 18:24:25 -05:00
parent b7e70092c5
commit a30bff21e8
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/science/misc/root/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, libX11 { stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, llvm_5
, libXpm , libXft, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre, pkgconfig , libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre
, python , xxHash, zlib, zstd , pkgconfig, python, xxHash, zlib, zstd
, libAfterImage, giflib, libjpeg, libtiff, libpng , libAfterImage, giflib, libjpeg, libtiff, libpng
, Cocoa, OpenGL, noSplash ? false }: , Cocoa, OpenGL, noSplash ? false }:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ makeWrapper cmake pkgconfig ]; 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) [ libX11 libXpm libXft libXext libGLU libGL ]
++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
; ;
@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
"-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_INCLUDEDIR=include"
"-Dalien=OFF" "-Dalien=OFF"
"-Dbonjour=OFF" "-Dbonjour=OFF"
"-Dbuiltin_llvm=OFF"
"-Dcastor=OFF" "-Dcastor=OFF"
"-Dchirp=OFF" "-Dchirp=OFF"
"-Dclad=OFF" "-Dclad=OFF"