Merge pull request #127679 from NixOS/revert-125407-patch-2

[21.05] Revert "php/generic: Allow to extend PHP_INI_SCAN_DIR"
This commit is contained in:
Kim Lindberger 2021-06-21 18:07:45 +02:00 committed by GitHub
commit 3c6f3f84af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -125,15 +125,15 @@ let
ln -s ${extraInit} $out/lib/php.ini
if test -e $out/bin/php; then
wrapProgram $out/bin/php --prefix PHP_INI_SCAN_DIR : $out/lib
wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib
fi
if test -e $out/bin/php-fpm; then
wrapProgram $out/bin/php-fpm --prefix PHP_INI_SCAN_DIR : $out/lib
wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib
fi
if test -e $out/bin/phpdbg; then
wrapProgram $out/bin/phpdbg --prefix PHP_INI_SCAN_DIR : $out/lib
wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib
fi
'';
};