diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-29 17:06:01 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-29 17:06:01 +0200 |
| commit | 36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64 (patch) | |
| tree | 3fc41497f5bfdb4683080bd7c7d8e412fb6aadc4 /pkgs/development/interpreters | |
| parent | afa9962538b12237f5a4604017fe9c0914404800 (diff) | |
| parent | c7d25a5db6beb915be4dd714821f342fab7980a2 (diff) | |
| download | nixlib-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar nixlib-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar.gz nixlib-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar.bz2 nixlib-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar.lz nixlib-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar.xz nixlib-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar.zst nixlib-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 4b112de1f0e7..6ab682d97e6c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -42,7 +42,7 @@ let # consecutive calls to buildEnv and overrides to work as # expected. mkBuildEnv = prevArgs: prevExtensionFunctions: lib.makeOverridable ( - { extensions ? ({...}: []), extraConfig ? "", ... }@innerArgs: + { extensions ? ({ enabled, ... }: enabled), extraConfig ? "", ... }@innerArgs: let allArgs = args // prevArgs // innerArgs; filteredArgs = builtins.removeAttrs allArgs [ "extensions" "extraConfig" ]; @@ -55,8 +55,8 @@ let allExtensionFunctions = prevExtensionFunctions ++ [ extensions ]; enabledExtensions = builtins.foldl' - (state: f: - f { enabled = state; all = php-packages.extensions; }) + (enabled: f: + f { inherit enabled; all = php-packages.extensions; }) [] allExtensionFunctions; |