diff options
| author | Elis Hirwing <elis@hirwing.se> | 2020-03-22 14:32:42 +0100 |
|---|---|---|
| committer | Elis Hirwing <elis@hirwing.se> | 2020-04-03 10:11:11 +0200 |
| commit | a5f77d6ea29935ac64777f709a32ee65faa1b0e7 (patch) | |
| tree | f44959f8ce7339846e2a0114b892251dfc16a41b /pkgs/servers/http/unit | |
| parent | be7bf5a18d155b9eb6de3a63ca0943b4c40856ae (diff) | |
| download | nixlib-a5f77d6ea29935ac64777f709a32ee65faa1b0e7.tar nixlib-a5f77d6ea29935ac64777f709a32ee65faa1b0e7.tar.gz nixlib-a5f77d6ea29935ac64777f709a32ee65faa1b0e7.tar.bz2 nixlib-a5f77d6ea29935ac64777f709a32ee65faa1b0e7.tar.lz nixlib-a5f77d6ea29935ac64777f709a32ee65faa1b0e7.tar.xz nixlib-a5f77d6ea29935ac64777f709a32ee65faa1b0e7.tar.zst nixlib-a5f77d6ea29935ac64777f709a32ee65faa1b0e7.zip | |
php-unit: Drop the declaration of the php-unit attributes since they aren't used
Diffstat (limited to 'pkgs/servers/http/unit')
| -rw-r--r-- | pkgs/servers/http/unit/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index afe4a4ed0a11..752a0fa493c1 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 config.php.fpm = 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"; @@ -49,8 +49,8 @@ in stdenv.mkDerivation rec { buildInputs = [ ] ++ optional withPython2 python2 ++ optionals withPython3 [ python3 ncurses ] - ++ optional withPHP72 php72 - ++ optional withPHP73 php73 + ++ optional withPHP72 php72-unit + ++ optional withPHP73 php73-unit ++ optional withPerl528 perl528 ++ optional withPerl530 perl530 ++ optional withPerldevel perldevel @@ -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.dev}/bin/php-config --lib-path=${php72}/lib"} - ${optionalString withPHP73 "./configure php --module=php73 --config=${php73.dev}/bin/php-config --lib-path=${php73}/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 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"} |