public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

php.buildEnv: Add phpIni attribute for easy access to the php.ini

This commit is contained in:
talyz 2020-04-24 19:34:34 +02:00
parent d61040716e
commit c3d5d92f4a
No known key found for this signature in database
GPG Key ID: 2DED2151F4671A2B
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/web-servers/apache-httpd/default.nix
View File

@ -338,7 +338,7 @@ let
} }
'' ''
cat ${php}/etc/php.ini > $out cat ${php}/etc/php.ini > $out
cat ${php}/lib/custom-php.ini > $out cat ${php.phpIni} > $out
echo "$options" >> $out echo "$options" >> $out
''; '';

5
pkgs/development/interpreters/php/default.nix
View File

@ -105,7 +105,7 @@ let
(enabledExtensions ++ (getDepsRecursively enabledExtensions))); (enabledExtensions ++ (getDepsRecursively enabledExtensions)));
extNames = map getExtName enabledExtensions; extNames = map getExtName enabledExtensions;
extraInit = writeText "custom-php.ini" '' extraInit = writeText "php.ini" ''
${lib.concatStringsSep "\n" ${lib.concatStringsSep "\n"
(lib.textClosureList extensionTexts extNames)} (lib.textClosureList extensionTexts extNames)}
${extraConfig} ${extraConfig}
@ -118,11 +118,12 @@ let
passthru = { passthru = {
buildEnv = mkBuildEnv allArgs allExtensionFunctions; buildEnv = mkBuildEnv allArgs allExtensionFunctions;
withExtensions = mkWithExtensions allArgs allExtensionFunctions; withExtensions = mkWithExtensions allArgs allExtensionFunctions;
phpIni = "${phpWithExtensions}/lib/php.ini";
inherit (php-packages) packages extensions; inherit (php-packages) packages extensions;
}; };
paths = [ php ]; paths = [ php ];
postBuild = '' postBuild = ''
cp ${extraInit} $out/lib/custom-php.ini cp ${extraInit} $out/lib/php.ini
wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib