diff options
| author | talyz <kim.lindberger@gmail.com> | 2020-04-24 19:34:34 +0200 |
|---|---|---|
| committer | talyz <kim.lindberger@gmail.com> | 2020-04-29 12:12:59 +0200 |
| commit | c3d5d92f4a9b78357b803d0591bc9adf0e17f584 (patch) | |
| tree | 4715eb4536cac69898c3ae38a8ac6c9ceab93541 | |
| parent | d61040716e4e7266f36e523f8ba5fa11f387548e (diff) | |
| download | nixlib-c3d5d92f4a9b78357b803d0591bc9adf0e17f584.tar nixlib-c3d5d92f4a9b78357b803d0591bc9adf0e17f584.tar.gz nixlib-c3d5d92f4a9b78357b803d0591bc9adf0e17f584.tar.bz2 nixlib-c3d5d92f4a9b78357b803d0591bc9adf0e17f584.tar.lz nixlib-c3d5d92f4a9b78357b803d0591bc9adf0e17f584.tar.xz nixlib-c3d5d92f4a9b78357b803d0591bc9adf0e17f584.tar.zst nixlib-c3d5d92f4a9b78357b803d0591bc9adf0e17f584.zip | |
php.buildEnv: Add phpIni attribute for easy access to the php.ini
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 5e55baa203a0..b72b249220df 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -338,7 +338,7 @@ let } '' cat ${php}/etc/php.ini > $out - cat ${php}/lib/custom-php.ini > $out + cat ${php.phpIni} > $out echo "$options" >> $out ''; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 2eda206ef2e4..4256e34980db 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -105,7 +105,7 @@ let (enabledExtensions ++ (getDepsRecursively enabledExtensions))); extNames = map getExtName enabledExtensions; - extraInit = writeText "custom-php.ini" '' + extraInit = writeText "php.ini" '' ${lib.concatStringsSep "\n" (lib.textClosureList extensionTexts extNames)} ${extraConfig} @@ -118,11 +118,12 @@ let passthru = { buildEnv = mkBuildEnv allArgs allExtensionFunctions; withExtensions = mkWithExtensions allArgs allExtensionFunctions; + phpIni = "${phpWithExtensions}/lib/php.ini"; inherit (php-packages) packages extensions; }; paths = [ php ]; 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 |