php: Wrap the programs and provide an environment variable instead of a flag

2020-03-28 09:57:04 +01:00 · 2020-03-28 09:57:04 +01:00 · 82cd2fbbf4
commit 82cd2fbbf4
parent 9ac0d9ad61
1 changed files with 7 additions and 4 deletions
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@ -192,10 +192,13 @@ let
            };
            paths = [ php ];
            postBuild = ''
-              wrapProgram $out/bin/php \
-                --add-flags "-c ${extraInit}"
-              wrapProgram $out/bin/php-fpm \
-                --add-flags "-c ${extraInit}"
+              cp ${extraInit} $out/lib/custom-php.ini
+
+              wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib
+
+              if test -e $out/bin/php-fpm; then
+                 wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib
+              fi
            '';
          };
    in