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

phpPackages: convert to scope

Browse Source 
This will make it easier to make overridable.

Had to rename `packages` attribute to `tools` in `php-packages.nix` because `packages` is shadowed by `makeScope`.
This commit is contained in:
Jan Tojnar
2020-12-15 17:42:21 +01:00
parent f3103172fd
commit 7e8b2b7e98
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ let
php = generic filteredArgs;
php-packages = (callPackage ../../../top-level/php-packages.nix {
php = phpWithExtensions;
phpPackage = phpWithExtensions;
});
allExtensionFunctions = prevExtensionFunctions ++ [ extensions ];
@@ -112,7 +112,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" ];
};