summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-07-07 05:58:43 +0200
committertv <tv@shackspace.de>2015-07-07 05:58:43 +0200
commit36d7524038b4090dc7f734bfc57cc2508dd8e8b4 (patch)
tree29efa37947033a738ef30c835112343ad45a63ee
parent366373e9c6d20501e0756a7e97cced2cb96d447d (diff)
tv cgit,sanitize: use empty directory from store
This is required for deploying to machines without /var/empty, like the nixos-install chroot.
-rw-r--r--modules/tv/git/cgit.nix2
-rw-r--r--modules/tv/sanitize.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/tv/git/cgit.nix b/modules/tv/git/cgit.nix
index ac67ecd1a..a3b72bf8e 100644
--- a/modules/tv/git/cgit.nix
+++ b/modules/tv/git/cgit.nix
@@ -14,7 +14,7 @@ in
name = "fcgiwrap";
uid = 2851179180; # genid fcgiwrap
group = "fcgiwrap";
- home = "/var/empty";
+ home = toString (pkgs.runCommand "empty" {} "mkdir -p $out");
};
users.extraGroups = lib.singleton {
diff --git a/modules/tv/sanitize.nix b/modules/tv/sanitize.nix
index b6c749b6d..adc8141da 100644
--- a/modules/tv/sanitize.nix
+++ b/modules/tv/sanitize.nix
@@ -3,6 +3,6 @@
{
nixpkgs.config.packageOverrides = pkgs:
{
- nano = /var/empty;
+ nano = pkgs.runCommand "empty" {} "mkdir -p $out";
};
}