mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-17 09:34:36 +00:00
Merge pull request #131033 from jasonrm/fix/php-llvmPackages
php: Use default llvm
This commit is contained in:
commit
3b538b3176
@ -12576,14 +12576,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;
|
||||
|
Loading…
Reference in New Issue
Block a user