diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-08-23 10:29:12 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-08-23 10:29:12 -0500 |
| commit | 90a72bd177ec55d24913fa32547cd78dca08624e (patch) | |
| tree | b1df32fffde3ef88f760179deea4af308969c7c3 /pkgs/os-specific/linux | |
| parent | c250748a54493d2b75ba88bf3b880f0167f8b5d1 (diff) | |
| parent | 06717667cc9e4c3c2025e101e6cf68cde0b25fcd (diff) | |
| download | nixlib-90a72bd177ec55d24913fa32547cd78dca08624e.tar nixlib-90a72bd177ec55d24913fa32547cd78dca08624e.tar.gz nixlib-90a72bd177ec55d24913fa32547cd78dca08624e.tar.bz2 nixlib-90a72bd177ec55d24913fa32547cd78dca08624e.tar.lz nixlib-90a72bd177ec55d24913fa32547cd78dca08624e.tar.xz nixlib-90a72bd177ec55d24913fa32547cd78dca08624e.tar.zst nixlib-90a72bd177ec55d24913fa32547cd78dca08624e.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/android-udev-rules/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/fanctl/default.nix | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 61e4291ecc50..3f763e917e34 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "android-udev-rules-20150301"; + name = "android-udev-rules-20150821"; src = fetchgit { url = "https://github.com/M0Rf30/android-udev-rules"; - rev = "2cc51a456ccfbca338c4e6b76211645aaac631e9"; - sha256 = "dbf1614cebb466d1adbcc5f17cefc0c37f148f9e3b46443b3e82f6cd19a1514f"; + rev = "07ccded2a89c2bb6da984e596c015c5e9546e497"; + sha256 = "953fc10bd0de46afef999dc1c1b20801b3d6e289af48d18fa96b1cac3ac54518"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix index f0b863e01488..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/ubuntu-fan 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/ubuntu-fan' fanctl + mkdir -p ${stateDir}' fanctl ''; installPhase = '' |