about summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2020-05-07 07:49:03 -0400
committerGitHub <noreply@github.com>2020-05-07 07:49:03 -0400
commitfb587d7bb5d85febbcb8853ce4eba4382ae10d28 (patch)
tree8a1846e3a2481fdc726facd8753f9ff9e721ab91 /pkgs/top-level/all-packages.nix
parent897c450cc51605ba4b9ed3b03b4dd0e405758b88 (diff)
parent164dfe4b44de535b6674647255de25bfc6a6e8d1 (diff)
downloadnixlib-fb587d7bb5d85febbcb8853ce4eba4382ae10d28.tar
nixlib-fb587d7bb5d85febbcb8853ce4eba4382ae10d28.tar.gz
nixlib-fb587d7bb5d85febbcb8853ce4eba4382ae10d28.tar.bz2
nixlib-fb587d7bb5d85febbcb8853ce4eba4382ae10d28.tar.lz
nixlib-fb587d7bb5d85febbcb8853ce4eba4382ae10d28.tar.xz
nixlib-fb587d7bb5d85febbcb8853ce4eba4382ae10d28.tar.zst
nixlib-fb587d7bb5d85febbcb8853ce4eba4382ae10d28.zip
Merge pull request #85445 from manveru/crystal-all-llvm
crystal: use llvm 10 exclusively
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a99751d4abdf..e218bdd74005 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8120,8 +8120,7 @@ in
   cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol;
 
   inherit (callPackages ../development/compilers/crystal {
-    stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
-    inherit (llvmPackages) clang llvm;
+    inherit (llvmPackages_10) stdenv clang llvm;
   })
     crystal_0_31
     crystal_0_32