From c72c6a48ca2c3090ea94df4474695524b5e68f9c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 22 Apr 2019 21:16:59 -0400 Subject: treewide: use llvm6 in some places MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not everything works on llvm7. It’s easiest to just provide the llvm6 as backup in this case. --- pkgs/tools/package-management/nix/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs/tools') diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 7590a37a8e3..ca1a38c4ab4 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -3,6 +3,7 @@ , stateDir ? "/nix/var" , confDir ? "/etc" , boehmgc +, llvmPackages_6 }: let @@ -174,6 +175,8 @@ in rec { }; inherit storeDir stateDir confDir boehmgc; + + stdenv = llvmPackages_6.stdenv; }; nixUnstable = lib.lowPrio (callPackage common rec { @@ -188,6 +191,8 @@ in rec { fromGit = true; inherit storeDir stateDir confDir boehmgc; + + stdenv = llvmPackages_6.stdenv; }); } -- cgit 1.4.1