diff options
| -rw-r--r-- | pkgs/build-support/build-pecl.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index bc905ee84a0..d75d3cf943a 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -16,10 +16,10 @@ }@args: stdenv.mkDerivation (args // { - pname = "php-${php.version}-${pname}"; + name = "php-${pname}-${version}"; extensionName = pname; - inherit version src; + inherit src; nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs; buildInputs = [ php ] ++ peclDeps ++ buildInputs; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3c8738565f6..c9c4414f2fb 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -16,7 +16,7 @@ lib.makeScope pkgs.newScope (self: with self; { # Wrap mkDerivation to prepend pname with "php-" to make names consistent # with how buildPecl does it and make the file easier to overview. mkDerivation = { pname, ... }@args: pkgs.stdenv.mkDerivation (args // { - pname = "php-${php.version}-${pname}"; + pname = "php-${pname}"; }); pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre; |