From 472d5c187ba37bc38c497cad00651bcb642ac082 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Wed, 8 Apr 2020 15:13:07 +0200
Subject: [PATCH] php.buildEnv: Don't inherit dev from the original php

mkDerivation uses the dev output in buildInputs if it exits, hence the
php-with-extensions package was never built or put into the path of
packages dependent on it during build. With this fix, the php packages
built with buildEnv or withExtensions don't have any dev outputs;
packages which need the dev output can refer to the phpXXbase packages
instead.
---
 pkgs/development/interpreters/php/default.nix | 2 +-
 pkgs/servers/http/unit/default.nix            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 94368b3f137..1d6576b383c 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -189,7 +189,7 @@ let
         in
           symlinkJoin {
             name = "php-with-extensions-${version}";
-            inherit (php) version dev;
+            inherit (php) version;
             nativeBuildInputs = [ makeWrapper ];
             passthru = {
               inherit buildEnv withExtensions enabledExtensions;
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index 752a0fa493c..96bc88b9f04 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, which
 , withPython2 ? false, python2
 , withPython3 ? true, python3, ncurses
-, withPHP72 ? false, php72
-, withPHP73 ? true, php73
+, withPHP72 ? false, php72base
+, withPHP73 ? true, php73base
 , withPerl528 ? false, perl528
 , withPerl530 ? true, perl530
 , withPerldevel ? false, perldevel
@@ -26,8 +26,8 @@ let
     config.php.fpm = false;
   };
 
-  php72-unit = php72.override phpConfig;
-  php73-unit = php73.override phpConfig;
+  php72-unit = php72base.override phpConfig;
+  php73-unit = php73base.override phpConfig;
 in stdenv.mkDerivation rec {
   version = "1.16.0";
   pname = "unit";