dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

php.buildEnv: Don't inherit dev from the original php

Browse Source 
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.
This commit is contained in:
talyz 2020-04-08 15:13:07 +02:00
parent f3cf0f074a
commit 472d5c187b
No known key found for this signature in database
GPG Key ID: 2DED2151F4671A2B
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
symlinkJoin {
name = "php-with-extensions-${version}";
inherit (php) version dev;
inherit (php) version;
nativeBuildInputs = [ makeWrapper ];
passthru = {
inherit buildEnv withExtensions enabledExtensions;

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

@ -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";