diff options
author | talyz <kim.lindberger@gmail.com> | 2020-05-29 00:32:12 +0200 |
---|---|---|
committer | talyz <kim.lindberger@gmail.com> | 2020-05-29 00:32:12 +0200 |
commit | bfdc832aef003c65c4f70561f3a5e7e00726452e (patch) | |
tree | 495950966b63d705c23384968a1374884ded7105 /pkgs/development/interpreters/php | |
parent | 8c5f4b8a3b1957c7c1919658bae1a4b5caf759b7 (diff) | |
download | nixlib-bfdc832aef003c65c4f70561f3a5e7e00726452e.tar nixlib-bfdc832aef003c65c4f70561f3a5e7e00726452e.tar.gz nixlib-bfdc832aef003c65c4f70561f3a5e7e00726452e.tar.bz2 nixlib-bfdc832aef003c65c4f70561f3a5e7e00726452e.tar.lz nixlib-bfdc832aef003c65c4f70561f3a5e7e00726452e.tar.xz nixlib-bfdc832aef003c65c4f70561f3a5e7e00726452e.tar.zst nixlib-bfdc832aef003c65c4f70561f3a5e7e00726452e.zip |
php.buildEnv: Let enabled extensions to pass through by default
If only extraConfig is specified in buildEnv, keep the currently enabled extensions active. Brought up in #89011.
Diffstat (limited to 'pkgs/development/interpreters/php')
-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; |