about summary refs log tree commit diff
path: root/pkgs/development/interpreters/php
diff options
context:
space:
mode:
authorLars Strojny <lars@strojny.net>2023-03-18 13:20:34 +0100
committerLars Strojny <lars@strojny.net>2023-03-19 22:04:35 +0100
commite81872b9f437de3a1d3cb91fc44a329cd88f450f (patch)
tree45480a215defc6b56bb64010b9ebeb9596b63f91 /pkgs/development/interpreters/php
parentac718d02867a84b42522a0ece52d841188208f2c (diff)
Set PHP_INI_SCAN_DIR only if not set
Only set PHP_INI_SCAN_DIR if it isn’t set yet. This is so that users can
provide there own PHP_INI_SCAN_DIR, e.g. to restart the current PHP process
without xdebug.
For example, composer/xdebug-handler uses this mechanism to turn off xdebug
(https://github.com/composer/xdebug-handler/blob/cf19e3380ffd84cea4a2cbfcc599ea07ef01f18a/src/XdebugHandler.php#L441)
Diffstat (limited to 'pkgs/development/interpreters/php')
-rw-r--r--pkgs/development/interpreters/php/generic.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix
index 74dedcfe2d18a..eb75606273b40 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
             '';
           };