From f863703dd296665ab9a653910bc2be8524c020c6 Mon Sep 17 00:00:00 2001 From: "Jason R. McNeil" Date: Wed, 14 Jul 2021 20:58:21 -0700 Subject: [PATCH] php: Use default llvm compiler-rt versions 5-10 were marked as broken on aarch64-darwin in #127979, preventing PHP from building. Original rationale from c72c6a48ca2c for llvm 6.x is that 7.x wasn't working for all packages, php being one, so it was locked to 6.x --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed1329180b20..159b85d8db4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12568,14 +12568,14 @@ in # Import PHP80 interpreter, extensions and packages php80 = callPackage ../development/interpreters/php/8.0.nix { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; }; php80Extensions = recurseIntoAttrs php80.extensions; php80Packages = recurseIntoAttrs php80.packages; # Import PHP74 interpreter, extensions and packages php74 = callPackage ../development/interpreters/php/7.4.nix { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; }; php74Extensions = recurseIntoAttrs php74.extensions; php74Packages = recurseIntoAttrs php74.packages;