public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89132 from talyz/php-buildenv-keep-extensions

Browse Source 
php.buildEnv: Let enabled extensions to pass through by default
This commit is contained in:
Maximilian Bosch 2020-05-29 13:03:43 +02:00 committed by GitHub
commit 4eb9c62591
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/php/default.nix
View File

@ -42,7 +42,7 @@ let
# consecutive calls to buildEnv and overrides to work as # consecutive calls to buildEnv and overrides to work as
# expected. # expected.
mkBuildEnv = prevArgs: prevExtensionFunctions: lib.makeOverridable ( mkBuildEnv = prevArgs: prevExtensionFunctions: lib.makeOverridable (
{ extensions ? ({...}: []), extraConfig ? "", ... }@innerArgs: { extensions ? ({ enabled, ... }: enabled), extraConfig ? "", ... }@innerArgs:
let let
allArgs = args // prevArgs // innerArgs; allArgs = args // prevArgs // innerArgs;
filteredArgs = builtins.removeAttrs allArgs [ "extensions" "extraConfig" ]; filteredArgs = builtins.removeAttrs allArgs [ "extensions" "extraConfig" ];
@ -55,8 +55,8 @@ let
allExtensionFunctions = prevExtensionFunctions ++ [ extensions ]; allExtensionFunctions = prevExtensionFunctions ++ [ extensions ];
enabledExtensions = enabledExtensions =
builtins.foldl' builtins.foldl'
(state: f: (enabled: f:
f { enabled = state; all = php-packages.extensions; }) f { inherit enabled; all = php-packages.extensions; })
[] []
allExtensionFunctions; allExtensionFunctions;