about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/fanctl
diff options
context:
space:
mode:
authorCharles Strahan <charles.c.strahan@gmail.com>2015-08-22 14:08:29 -0400
committerCharles Strahan <charles.c.strahan@gmail.com>2015-08-22 14:14:56 -0400
commit7408ede358ba79c011db35e03abce0759e643ddf (patch)
tree22d34478fdbb409c4491afab86dd05a3ad2693ea /pkgs/os-specific/linux/fanctl
parent648973d6419992c28322954ad0205cb05ef87997 (diff)
downloadnixlib-7408ede358ba79c011db35e03abce0759e643ddf.tar
nixlib-7408ede358ba79c011db35e03abce0759e643ddf.tar.gz
nixlib-7408ede358ba79c011db35e03abce0759e643ddf.tar.bz2
nixlib-7408ede358ba79c011db35e03abce0759e643ddf.tar.lz
nixlib-7408ede358ba79c011db35e03abce0759e643ddf.tar.xz
nixlib-7408ede358ba79c011db35e03abce0759e643ddf.tar.zst
nixlib-7408ede358ba79c011db35e03abce0759e643ddf.zip
fanctl: fix state directory
Diffstat (limited to 'pkgs/os-specific/linux/fanctl')
-rw-r--r--pkgs/os-specific/linux/fanctl/default.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix
index 1d6e5e744cdf..61e100f4c9b7 100644
--- a/pkgs/os-specific/linux/fanctl/default.nix
+++ b/pkgs/os-specific/linux/fanctl/default.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, fetchbzr, makeWrapper, bridge-utils, iproute, dnsmasq, iptables, kmod, utillinux }:
 
-stdenv.mkDerivation rec {
+let stateDir = "/var/lib/fan-networking";
+in stdenv.mkDerivation rec {
   name = "fanctl-${version}";
 
   version = "0.3.0";
@@ -17,16 +18,16 @@ stdenv.mkDerivation rec {
   # if that files does not exist, dnsmasq subsequently fails,
   # so we'll use /dev/null.
   #
-  # Also, make sure /var/lib/fan-networking exists before starting dnsmasq.
+  # Also, make sure the state directory before starting dnsmasq.
   buildPhase = ''
     substituteInPlace fanctl \
       --replace '--conf-file= ' \
                 '--conf-file=/dev/null ' \
       --replace '/var/lib/misc' \
-                '/var/lib/ubuntu-fan'
+                '${stateDir}'
 
     sed -i '/dnsmasq -u/i \
-    mkdir -p /var/lib/fan-networking' fanctl
+    mkdir -p ${stateDir}' fanctl
   '';
 
   installPhase = ''