diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index d84497e8019c..727ed0c21975 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -1,6 +1,8 @@ { stdenv, php, autoreconfHook }: -args: stdenv.mkDerivation (args // { +args@{ name, ... }: stdenv.mkDerivation (args // { + name = "php-${name}"; + buildInputs = [ php autoreconfHook ] ++ args.buildInputs or []; makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ args.makeFlags or []; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fadcb46b0f88..4dde2597d0b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3523,9 +3523,9 @@ let php = php54; - phpPackages = import ./php-packages.nix { + phpPackages = recurseIntoAttrs (import ./php-packages.nix { inherit php pkgs; - }; + }); php53 = callPackage ../development/interpreters/php/5.3.nix { };