about summary refs log tree commit diff
path: root/pkgs/development/interpreters
diff options
context:
space:
mode:
authorElis Hirwing <elis@hirwing.se>2020-03-28 09:57:04 +0100
committertalyz <kim.lindberger@gmail.com>2020-04-05 16:44:25 +0200
commit82cd2fbbf470b0b53005737e8fd833a77cf2f38c (patch)
tree04dbae7588fa44fc99430a9bc22e245396aa6bbd /pkgs/development/interpreters
parent9ac0d9ad61a2e5cce6fc8ae6c282df3ec9e77f98 (diff)
downloadnixlib-82cd2fbbf470b0b53005737e8fd833a77cf2f38c.tar
nixlib-82cd2fbbf470b0b53005737e8fd833a77cf2f38c.tar.gz
nixlib-82cd2fbbf470b0b53005737e8fd833a77cf2f38c.tar.bz2
nixlib-82cd2fbbf470b0b53005737e8fd833a77cf2f38c.tar.lz
nixlib-82cd2fbbf470b0b53005737e8fd833a77cf2f38c.tar.xz
nixlib-82cd2fbbf470b0b53005737e8fd833a77cf2f38c.tar.zst
nixlib-82cd2fbbf470b0b53005737e8fd833a77cf2f38c.zip
php: Wrap the programs and provide an environment variable instead of a flag
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r--pkgs/development/interpreters/php/default.nix11
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 082f2ef8fdcd..bfb024077c81 100644
--- 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