git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #89132 from talyz/php-buildenv-keep-extensions

php.buildEnv: Let enabled extensions to pass through by default

commit4eb9c625913fb06988365720235747feb87300be authorMaximilian Bosch <maximilian@mbosch.me> dateFri 29 May 2020, 13:03 (6 years ago) parent22a231cbfdc832
1 file changed+3−3
pkgs/development/interpreters/php/default.nix+3−3
pkgs/development/interpreters/php/default.nix+3−3
@@ -42,7 +42,7 @@ let
4242 # consecutive calls to buildEnv and overrides to work as
4343 # expected.
4444 mkBuildEnv = prevArgs: prevExtensionFunctions: lib.makeOverridable (
45− { extensions ? ({...}: []), extraConfig ? "", ... }@innerArgs:
45+ { extensions ? ({ enabled, ... }: enabled), extraConfig ? "", ... }@innerArgs:
4646 let
4747 allArgs = args // prevArgs // innerArgs;
4848 filteredArgs = builtins.removeAttrs allArgs [ "extensions" "extraConfig" ];
@@ -55,8 +55,8 @@ let
5555 allExtensionFunctions = prevExtensionFunctions ++ [ extensions ];
5656 enabledExtensions =
5757 builtins.foldl'
58− (state: f:
59− f { enabled = state; all = php-packages.extensions; })
58+ (enabled: f:
59+ f { inherit enabled; all = php-packages.extensions; })
6060 []
6161 allExtensionFunctions;
6262