diff options
| author | Elis Hirwing <elis@hirwing.se> | 2023-04-04 12:46:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-04 12:46:08 +0200 |
| commit | f427d9477c98ece10d4dc7d9f16bf2b5a5844a4d (patch) | |
| tree | d886c09155c2b8f1f5aadf9e65899f69f9e54050 | |
| parent | Merge pull request #213419 from stig/ox-rss (diff) | |
| parent | Set PHP_INI_SCAN_DIR only if not set (diff) | |
| download | nixpkgs-f427d9477c98ece10d4dc7d9f16bf2b5a5844a4d.tar.gz | |
Merge pull request #221845 from lstrojny/fix-php-wrapper
Set PHP_INI_SCAN_DIR only if not set
| -rw-r--r-- | pkgs/development/interpreters/php/generic.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 74dedcfe2d18..eb75606273b4 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -170,19 +170,19 @@ let ln -s ${extraInit} $out/lib/php.ini if test -e $out/bin/php; then - wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/php --set-default PHP_INI_SCAN_DIR $out/lib fi if test -e $out/bin/php-fpm; then - wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/php-fpm --set-default PHP_INI_SCAN_DIR $out/lib fi if test -e $out/bin/phpdbg; then - wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/phpdbg --set-default PHP_INI_SCAN_DIR $out/lib fi if test -e $out/bin/php-cgi; then - wrapProgram $out/bin/php-cgi --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/php-cgi --set-default PHP_INI_SCAN_DIR $out/lib fi ''; }; |