diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2021-06-13 20:45:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-13 20:45:21 +0200 |
| commit | ab11d2114ec6d6181748ca17cdc7f37866165324 (patch) | |
| tree | fb4009924aa3040b0336cf449892563e9544e569 /nixos | |
| parent | f7865c8c34a96580cf9f1adba83c86f4f12cd654 (diff) | |
| parent | c38c5dba10e5a239a4d297c64f4c0a5fd2d5e1b9 (diff) | |
| download | nixlib-ab11d2114ec6d6181748ca17cdc7f37866165324.tar nixlib-ab11d2114ec6d6181748ca17cdc7f37866165324.tar.gz nixlib-ab11d2114ec6d6181748ca17cdc7f37866165324.tar.bz2 nixlib-ab11d2114ec6d6181748ca17cdc7f37866165324.tar.lz nixlib-ab11d2114ec6d6181748ca17cdc7f37866165324.tar.xz nixlib-ab11d2114ec6d6181748ca17cdc7f37866165324.tar.zst nixlib-ab11d2114ec6d6181748ca17cdc7f37866165324.zip | |
Merge pull request #126680 from roberth/empty
emptyFile, emptyDirectory: init
Diffstat (limited to 'nixos')
| -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 a7b93c9c4598..df7035c03cc2 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: '' |