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

Revert "php: Add php package versions to extensions/packages pnames" 

This reverts commit a081dcf86d.
This commit is contained in:
Maximilian Bosch 2021-03-04 15:26:36 +01:00
parent d4821a4892
commit 8c26eaa144
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/build-pecl.nix
View File

@ -16,10 +16,10 @@
}@args: }@args:
stdenv.mkDerivation (args // { stdenv.mkDerivation (args // {
pname = "php-${php.version}-${pname}"; name = "php-${pname}-${version}";
extensionName = pname; extensionName = pname;
inherit version src; inherit src;
nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs; nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs;
buildInputs = [ php ] ++ peclDeps ++ buildInputs; buildInputs = [ php ] ++ peclDeps ++ buildInputs;

2
pkgs/top-level/php-packages.nix
View File

@ -16,7 +16,7 @@ lib.makeScope pkgs.newScope (self: with self; {
# Wrap mkDerivation to prepend pname with "php-" to make names consistent # Wrap mkDerivation to prepend pname with "php-" to make names consistent
# with how buildPecl does it and make the file easier to overview. # with how buildPecl does it and make the file easier to overview.
mkDerivation = { pname, ... }@args: pkgs.stdenv.mkDerivation (args // { 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; pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre;