diff options
| author | Elis Hirwing <elis@hirwing.se> | 2021-02-27 18:29:08 +0100 |
|---|---|---|
| committer | Elis Hirwing <elis@hirwing.se> | 2021-02-27 21:57:02 +0100 |
| commit | a081dcf86de4f100efe604a52b32df4b14892f44 (patch) | |
| tree | 662205e03cc07b92358abe6c9e3639f5b1ba54a1 | |
| parent | 5df05c902cde398e056eb6271d5fe13e418db4c6 (diff) | |
| download | nixpkgs-a081dcf86de4f100efe604a52b32df4b14892f44.tar nixpkgs-a081dcf86de4f100efe604a52b32df4b14892f44.tar.gz nixpkgs-a081dcf86de4f100efe604a52b32df4b14892f44.tar.bz2 nixpkgs-a081dcf86de4f100efe604a52b32df4b14892f44.tar.lz nixpkgs-a081dcf86de4f100efe604a52b32df4b14892f44.tar.xz nixpkgs-a081dcf86de4f100efe604a52b32df4b14892f44.tar.zst nixpkgs-a081dcf86de4f100efe604a52b32df4b14892f44.zip | |
php: Add php package versions to extensions/packages pnames
| -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 d75d3cf943a..bc905ee84a0 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -16,10 +16,10 @@ }@args: stdenv.mkDerivation (args // { - name = "php-${pname}-${version}"; + pname = "php-${php.version}-${pname}"; extensionName = pname; - inherit src; + inherit version 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 c9c4414f2fb..3c8738565f6 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-${pname}"; + pname = "php-${php.version}-${pname}"; }); pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre; |