From a081dcf86de4f100efe604a52b32df4b14892f44 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 27 Feb 2021 18:29:08 +0100
Subject: php: Add php package versions to extensions/packages pnames

---
 pkgs/build-support/build-pecl.nix | 4 ++--
 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;
-- 
cgit 1.4.1