diff options
| author | Luka Blaskovic <lblasc@tvbeat.com> | 2020-01-18 19:30:00 +0000 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-01-30 18:35:30 -0500 |
| commit | 241236bc9e3293ecb94711a9feaaa7a397bb933f (patch) | |
| tree | 3df194a9b29cd1f38e4d0131a087a17895f97a54 /pkgs | |
| parent | 0eafee83285b2287d5ddcd1598f2405667b7d09f (diff) | |
| download | nixlib-241236bc9e3293ecb94711a9feaaa7a397bb933f.tar nixlib-241236bc9e3293ecb94711a9feaaa7a397bb933f.tar.gz nixlib-241236bc9e3293ecb94711a9feaaa7a397bb933f.tar.bz2 nixlib-241236bc9e3293ecb94711a9feaaa7a397bb933f.tar.lz nixlib-241236bc9e3293ecb94711a9feaaa7a397bb933f.tar.xz nixlib-241236bc9e3293ecb94711a9feaaa7a397bb933f.tar.zst nixlib-241236bc9e3293ecb94711a9feaaa7a397bb933f.zip | |
mozart: build with llvmPackages_5
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/mozart/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index 97634bca8ef7..b8951c8c8004 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -6,7 +6,7 @@ , makeWrapper , boost , llvmPackages -, llvmPackages_4 +, llvmPackages_5 , gmp , emacs , emacs25-nox @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { "-DCMAKE_C_COMPILER=${llvmPackages.clang}/bin/clang" "-DBoost_USE_STATIC_LIBS=OFF" "-DMOZART_BOOST_USE_STATIC_LIBS=OFF" - "-DCMAKE_PROGRAM_PATH=${llvmPackages_4.clang}/bin" + "-DCMAKE_PROGRAM_PATH=${llvmPackages_5.clang}/bin" # Rationale: Nix's cc-wrapper needs to see a compile flag (like -c) to # infer that it is not a linking call, and stop trashing the command line # with linker flags. @@ -69,9 +69,9 @@ in stdenv.mkDerivation rec { buildInputs = [ boost - llvmPackages_4.llvm - llvmPackages_4.clang - llvmPackages_4.clang-unwrapped + llvmPackages_5.llvm + llvmPackages_5.clang + llvmPackages_5.clang-unwrapped gmp emacs25-nox jre_headless |