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

php: support two- and zero-argument overrideAttrs forms (#356870)

Browse Source
This commit is contained in:
Pol Dellaiera 2024-11-24 12:53:28 +01:00 committed by GitHub
commit ecdda28a3a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/interpreters/php/generic.nix
View File

@ -37,7 +37,7 @@ let
, hash ? null
, extraPatches ? [ ]
, packageOverrides ? (final: prev: { })
, phpAttrsOverrides ? (attrs: { })
, phpAttrsOverrides ? (final: prev: { })
, pearInstallPhar ? (callPackage ./install-pear-nozlib-phar.nix { })
# Sapi flags
@ -63,16 +63,6 @@ let
}@args:
let
# Compose two functions of the type expected by 'overrideAttrs'
# into one where changes made in the first are available to the second.
composeOverrides =
f: g: attrs:
let
fApplied = f attrs;
attrs' = attrs // fApplied;
in
fApplied // g attrs';
# buildEnv wraps php to provide additional extensions and
# configuration. Its usage is documented in
# doc/languages-frameworks/php.section.md.
@ -153,7 +143,8 @@ let
overrideAttrs =
f:
let
newPhpAttrsOverrides = composeOverrides (filteredArgs.phpAttrsOverrides or (attrs: { })) f;
phpAttrsOverrides = filteredArgs.phpAttrsOverrides or (final: prev: { });
newPhpAttrsOverrides = lib.composeExtensions (lib.toExtension phpAttrsOverrides) (lib.toExtension f);
php = generic (filteredArgs // { phpAttrsOverrides = newPhpAttrsOverrides; });
in
php.buildEnv { inherit extensions extraConfig; };
@ -342,7 +333,7 @@ let
overrideAttrs =
f:
let
newPhpAttrsOverrides = composeOverrides phpAttrsOverrides f;
newPhpAttrsOverrides = lib.composeExtensions (lib.toExtension phpAttrsOverrides) (lib.toExtension f);
php = generic (args // { phpAttrsOverrides = newPhpAttrsOverrides; });
in
php;
@ -359,8 +350,9 @@ let
outputsToInstall = [ "out" "dev" ];
};
};
final = attrs // (lib.toExtension phpAttrsOverrides) final attrs;
in
attrs // phpAttrsOverrides attrs
final
);
in
generic