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

Merge pull request #84721 from talyz/php-dont-inherit-dev

Browse Source 
php.buildEnv: Don't inherit dev from the original php
This commit is contained in:
Elis Hirwing 2020-04-08 16:38:33 +02:00 committed by GitHub
commit 258980146c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/php/default.nix
View File

@ -189,7 +189,7 @@ let
in in
symlinkJoin { symlinkJoin {
name = "php-with-extensions-${version}"; name = "php-with-extensions-${version}";
inherit (php) version dev; inherit (php) version;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
passthru = { passthru = {
inherit buildEnv withExtensions enabledExtensions; inherit buildEnv withExtensions enabledExtensions;

8
pkgs/servers/http/unit/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, which { stdenv, fetchFromGitHub, which
, withPython2 ? false, python2 , withPython2 ? false, python2
, withPython3 ? true, python3, ncurses , withPython3 ? true, python3, ncurses
, withPHP72 ? false, php72 , withPHP72 ? false, php72base
, withPHP73 ? true, php73 , withPHP73 ? true, php73base
, withPerl528 ? false, perl528 , withPerl528 ? false, perl528
, withPerl530 ? true, perl530 , withPerl530 ? true, perl530
, withPerldevel ? false, perldevel , withPerldevel ? false, perldevel
@ -26,8 +26,8 @@ let
config.php.fpm = false; config.php.fpm = false;
}; };
php72-unit = php72.override phpConfig; php72-unit = php72base.override phpConfig;
php73-unit = php73.override phpConfig; php73-unit = php73base.override phpConfig;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "1.16.0"; version = "1.16.0";
pname = "unit"; pname = "unit";