Skip to content

Commit

Permalink
unit: clean up withPerl arguments
Browse files Browse the repository at this point in the history
Only provide one `withPerl` argument instead of one per perl version
provided by nixpkgs.
  • Loading branch information
stigtsp committed Sep 8, 2024
1 parent 816958c commit 762d2c1
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions pkgs/servers/http/unit/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
, withPython3 ? true, python3, ncurses
, withPHP81 ? true, php81
, withPHP82 ? false, php82
, withPerl538 ? false, perl540
, withPerl540 ? true, perl538
, withPerl ? true, perl
, withRuby_3_1 ? true, ruby_3_1
, withRuby_3_2 ? false, ruby_3_2
, withSSL ? true, openssl ? null
Expand Down Expand Up @@ -43,8 +42,7 @@ in stdenv.mkDerivation rec {
++ optionals withPython3 [ python3 ncurses ]
++ optional withPHP81 php81-unit
++ optional withPHP82 php82-unit
++ optional withPerl538 perl538
++ optional withPerl540 perl540
++ optional withPerl perl
++ optional withRuby_3_1 ruby_3_1
++ optional withRuby_3_2 ruby_3_2
++ optional withSSL openssl;
Expand All @@ -65,8 +63,7 @@ in stdenv.mkDerivation rec {
${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"}
${optionalString withPHP81 "./configure php --module=php81 --config=${php81-unit.unwrapped.dev}/bin/php-config --lib-path=${php81-unit}/lib"}
${optionalString withPHP82 "./configure php --module=php81 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"}
${optionalString withPerl538 "./configure perl --module=perl538 --perl=${perl538}/bin/perl"}
${optionalString withPerl540 "./configure perl --module=perl540 --perl=${perl540}/bin/perl"}
${optionalString withPerl "./configure perl --module=perl --perl=${perl}/bin/perl"}
${optionalString withRuby_3_1 "./configure ruby --module=ruby31 --ruby=${ruby_3_1}/bin/ruby"}
${optionalString withRuby_3_2 "./configure ruby --module=ruby32 --ruby=${ruby_3_2}/bin/ruby"}
'';
Expand Down

0 comments on commit 762d2c1

Please sign in to comment.