Merge pull request #221845 from lstrojny/fix-php-wrapper
Set PHP_INI_SCAN_DIR only if not set
This commit is contained in:
commit
f427d9477c
|
@ -170,19 +170,19 @@ let
|
||||||
ln -s ${extraInit} $out/lib/php.ini
|
ln -s ${extraInit} $out/lib/php.ini
|
||||||
|
|
||||||
if test -e $out/bin/php; then
|
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
|
fi
|
||||||
|
|
||||||
if test -e $out/bin/php-fpm; then
|
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
|
fi
|
||||||
|
|
||||||
if test -e $out/bin/phpdbg; then
|
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
|
fi
|
||||||
|
|
||||||
if test -e $out/bin/php-cgi; then
|
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
|
fi
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue