diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-23 00:48:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-23 00:48:29 +0000 |
| commit | 28fd8e0d598ad27ecece751827396ab765a6a34e (patch) | |
| tree | c28cd15292529e434d2c7d5272371aa3c1b3e2a2 /pkgs/development/interpreters/php/generic.nix | |
| parent | e0d458ed2c77bfed6db792a5dd94392871cacc3f (diff) | |
| parent | 00f6d352bd4598bdcd6b5c9884430e9e2d6084a6 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters/php/generic.nix')
| -rw-r--r-- | pkgs/development/interpreters/php/generic.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 4a96abcf9b69..82134e14406f 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -13,6 +13,7 @@ let , version , sha256 , extraPatches ? [] + , packageOverrides ? (final: prev: {}) # Sapi flags , cgiSupport ? true @@ -49,8 +50,8 @@ let php = generic filteredArgs; php-packages = (callPackage ../../../top-level/php-packages.nix { - php = phpWithExtensions; - }); + phpPackage = phpWithExtensions; + }).overrideScope' packageOverrides; allExtensionFunctions = prevExtensionFunctions ++ [ extensions ]; enabledExtensions = @@ -112,7 +113,8 @@ let phpIni = "${phpWithExtensions}/lib/php.ini"; unwrapped = php; tests = nixosTests.php; - inherit (php-packages) packages extensions buildPecl; + inherit (php-packages) extensions buildPecl; + packages = php-packages.tools; meta = php.meta // { outputsToInstall = [ "out" ]; }; |