about summary refs log tree commit diff
path: root/pkgs/servers/http
diff options
context:
space:
mode:
authorElis Hirwing <elis@hirwing.se>2020-05-30 18:52:41 +0200
committerElis Hirwing <elis@hirwing.se>2020-05-30 18:52:41 +0200
commita4bf2cc1666079b0d1d46cb059fe263bd56fd6ec (patch)
treec939700583afb98d0172bd75960d4cfbf5869050 /pkgs/servers/http
parentf75d62941d8ad616bfc334ae19d71a0a6677dd19 (diff)
downloadnixlib-a4bf2cc1666079b0d1d46cb059fe263bd56fd6ec.tar
nixlib-a4bf2cc1666079b0d1d46cb059fe263bd56fd6ec.tar.gz
nixlib-a4bf2cc1666079b0d1d46cb059fe263bd56fd6ec.tar.bz2
nixlib-a4bf2cc1666079b0d1d46cb059fe263bd56fd6ec.tar.lz
nixlib-a4bf2cc1666079b0d1d46cb059fe263bd56fd6ec.tar.xz
nixlib-a4bf2cc1666079b0d1d46cb059fe263bd56fd6ec.tar.zst
nixlib-a4bf2cc1666079b0d1d46cb059fe263bd56fd6ec.zip
unit: Expose PHP expressions used so it can easily be accessed for configs
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r--pkgs/servers/http/unit/default.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index c161566d329f..1d5f28834f22 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
     ++ optionals withPython3 [ python3 ncurses ]
     ++ optional withPHP72 php72-unit
     ++ optional withPHP73 php73-unit
-    ++ optional withPHP73 php74-unit
+    ++ optional withPHP74 php74-unit
     ++ optional withPerl528 perl528
     ++ optional withPerl530 perl530
     ++ optional withPerldevel perldevel
@@ -67,6 +67,11 @@ in stdenv.mkDerivation rec {
     ++ optional (!withIPv6) "--no-ipv6"
     ++ optional withDebug   "--debug";
 
+  # Optionally add the PHP derivations used so they can be addressed in the configs
+  usedPhp72 = optionals withPHP72 php72-unit;
+  usedPhp73 = optionals withPHP73 php73-unit;
+  usedPhp74 = optionals withPHP74 php74-unit;
+
   postConfigure = ''
     ${optionalString withPython2    "./configure python --module=python2  --config=${python2}/bin/python2-config  --lib-path=${python2}/lib"}
     ${optionalString withPython3    "./configure python --module=python3  --config=${python3}/bin/python3-config  --lib-path=${python3}/lib"}