about summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorElis Hirwing <elis@hirwing.se>2020-04-08 16:38:33 +0200
committerGitHub <noreply@github.com>2020-04-08 16:38:33 +0200
commit258980146c9ac88f1aad12d782e460f21c61b5cd (patch)
tree06823c7f8d3770dbe1bbefec9f8a7be3cf9ac59d /pkgs/servers
parentfe8875a363fc887ca4bb87a1178586dfeba8c237 (diff)
parent472d5c187ba37bc38c497cad00651bcb642ac082 (diff)
downloadnixlib-258980146c9ac88f1aad12d782e460f21c61b5cd.tar
nixlib-258980146c9ac88f1aad12d782e460f21c61b5cd.tar.gz
nixlib-258980146c9ac88f1aad12d782e460f21c61b5cd.tar.bz2
nixlib-258980146c9ac88f1aad12d782e460f21c61b5cd.tar.lz
nixlib-258980146c9ac88f1aad12d782e460f21c61b5cd.tar.xz
nixlib-258980146c9ac88f1aad12d782e460f21c61b5cd.tar.zst
nixlib-258980146c9ac88f1aad12d782e460f21c61b5cd.zip
Merge pull request #84721 from talyz/php-dont-inherit-dev
php.buildEnv: Don't inherit dev from the original php
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/http/unit/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index 752a0fa493c1..96bc88b9f04d 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";