mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Merge pull request #84721 from talyz/php-dont-inherit-dev
php.buildEnv: Don't inherit dev from the original php
This commit is contained in:
commit
258980146c
|
@ -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;
|
||||
|
|
|
@ -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";
|
||||
|
|
Loading…
Reference in a new issue