diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-14 00:08:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-14 00:08:51 +0000 |
| commit | 9a860729b23bb5124181de6d94ba7cc96bbffa75 (patch) | |
| tree | 254bafaed8938b55f485b187ece97973e739b829 /nixos/modules/services/web-servers | |
| parent | 162e6eaa34c9c82ca589e655cd942d319bf22ba8 (diff) | |
| parent | 13f31f60bf933de43c4b4f5c6601a7a2376cd334 (diff) | |
| download | nixpkgs-9a860729b23bb5124181de6d94ba7cc96bbffa75.tar nixpkgs-9a860729b23bb5124181de6d94ba7cc96bbffa75.tar.gz nixpkgs-9a860729b23bb5124181de6d94ba7cc96bbffa75.tar.bz2 nixpkgs-9a860729b23bb5124181de6d94ba7cc96bbffa75.tar.lz nixpkgs-9a860729b23bb5124181de6d94ba7cc96bbffa75.tar.xz nixpkgs-9a860729b23bb5124181de6d94ba7cc96bbffa75.tar.zst nixpkgs-9a860729b23bb5124181de6d94ba7cc96bbffa75.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/services/web-servers')
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 2 |
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 a7b93c9c459..df7035c03cc 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -202,7 +202,7 @@ let let documentRoot = if hostOpts.documentRoot != null then hostOpts.documentRoot - else pkgs.runCommand "empty" { preferLocalBuild = true; } "mkdir -p $out" + else pkgs.emptyDirectory ; mkLocations = locations: concatStringsSep "\n" (map (config: '' |