Merge master into staging-next

2021-03-27 18:14:08 +00:00
parent 5021a8bc13 9cc8c600c6
commit 95c24d591a
22 changed files with 285 additions and 97 deletions
@@ -124,7 +124,9 @@ let
                postBuild = ''
                  ln -s ${extraInit} $out/lib/php.ini

-                  wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib
+                  if test -e $out/bin/php; then
+                    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 --set PHP_INI_SCAN_DIR $out/lib