diff options
| author | talyz <kim.lindberger@gmail.com> | 2020-04-29 12:46:26 +0200 |
|---|---|---|
| committer | talyz <kim.lindberger@gmail.com> | 2020-04-29 13:45:48 +0200 |
| commit | 5cad1b4aff3054b9c3ab97c420cce7b09b342dc8 (patch) | |
| tree | 3f431327a20fb33e70e14a3f4ff9bea37de1478d /pkgs/servers | |
| parent | 3bfd4e864f6c97c47efb1a353566e4fe4402b611 (diff) | |
| download | nixpkgs-5cad1b4aff3054b9c3ab97c420cce7b09b342dc8.tar nixpkgs-5cad1b4aff3054b9c3ab97c420cce7b09b342dc8.tar.gz nixpkgs-5cad1b4aff3054b9c3ab97c420cce7b09b342dc8.tar.bz2 nixpkgs-5cad1b4aff3054b9c3ab97c420cce7b09b342dc8.tar.lz nixpkgs-5cad1b4aff3054b9c3ab97c420cce7b09b342dc8.tar.xz nixpkgs-5cad1b4aff3054b9c3ab97c420cce7b09b342dc8.tar.zst nixpkgs-5cad1b4aff3054b9c3ab97c420cce7b09b342dc8.zip | |
php: Get rid of the phpXXbase attributes, update docs
Since the introduction of php.unwrapped there's no real need for the phpXXbase attributes, so let's remove them to lessen potential confusion and clutter. Also update the docs to make it clear how to get hold of an unwrapped PHP if needed.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/unit/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index f8992bf166b..0779a31f106 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, php72base -, withPHP73 ? true, php73base +, withPHP72 ? false, php72 +, withPHP73 ? true, php73 , withPerl528 ? false, perl528 , withPerl530 ? true, perl530 , withPerldevel ? false, perldevel @@ -26,8 +26,8 @@ let fpmSupport = false; }; - php72-unit = php72base.override phpConfig; - php73-unit = php73base.override phpConfig; + php72-unit = php72.override phpConfig; + php73-unit = php73.override phpConfig; in stdenv.mkDerivation rec { version = "1.16.0"; pname = "unit"; @@ -71,8 +71,8 @@ in stdenv.mkDerivation rec { postConfigure = '' ${optionalString withPython2 "./configure python --module=python2 --config=${python2}/bin/python2-config --lib-path=${python2}/lib"} ${optionalString withPython3 "./configure python --module=python3 --config=${python3}/bin/python3-config --lib-path=${python3}/lib"} - ${optionalString withPHP72 "./configure php --module=php72 --config=${php72-unit.dev}/bin/php-config --lib-path=${php72-unit}/lib"} - ${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.dev}/bin/php-config --lib-path=${php73-unit}/lib"} + ${optionalString withPHP72 "./configure php --module=php72 --config=${php72-unit.unwrapped.dev}/bin/php-config --lib-path=${php72-unit}/lib"} + ${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.unwrapped.dev}/bin/php-config --lib-path=${php73-unit}/lib"} ${optionalString withPerl528 "./configure perl --module=perl528 --perl=${perl528}/bin/perl"} ${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} |