about summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-04-16 23:14:28 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-04-17 14:41:21 +0200
commit4816b426a057df94f0533d783d3cf6a4c5607aa3 (patch)
tree9e8f510ace86d0dab78361070ca2694981c0a406 /nixos/modules/services
parent23a6903bb7f32068587a66af00404a5e81881215 (diff)
downloadnixlib-4816b426a057df94f0533d783d3cf6a4c5607aa3.tar
nixlib-4816b426a057df94f0533d783d3cf6a4c5607aa3.tar.gz
nixlib-4816b426a057df94f0533d783d3cf6a4c5607aa3.tar.bz2
nixlib-4816b426a057df94f0533d783d3cf6a4c5607aa3.tar.lz
nixlib-4816b426a057df94f0533d783d3cf6a4c5607aa3.tar.xz
nixlib-4816b426a057df94f0533d783d3cf6a4c5607aa3.tar.zst
nixlib-4816b426a057df94f0533d783d3cf6a4c5607aa3.zip
nixos/httpd: remove unnecessary override
This was introduced in https://github.com/NixOS/nixpkgs/commit/c801cd1a047efa51055fd04698e316ddd503fd1b
but it no longer seems necessary.
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index faefd1bfd090..5e55baa203a0 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -12,7 +12,7 @@ let
 
   httpdConf = cfg.configFile;
 
-  php = cfg.phpPackage.override { apacheHttpd = pkg.dev; /* otherwise it only gets .out */ };
+  php = cfg.phpPackage.override { apacheHttpd = pkg; };
 
   phpMajorVersion = lib.versions.major (lib.getVersion php);