diff options
author | Paul Colomiets <paul@colomiets.name> | 2014-07-03 01:59:35 +0300 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2014-08-28 11:39:03 -0700 |
commit | adbb9ff7966c1c17588100d6afddda66eafc9453 (patch) | |
tree | 7110194f95ecfb7d938f230f0701221026dd3315 /pkgs/tools/networking/dnsmasq/default.nix | |
parent | 1851efa1a7143b3f1fad4c4f1e046ff418f69d0e (diff) | |
download | nixlib-adbb9ff7966c1c17588100d6afddda66eafc9453.tar nixlib-adbb9ff7966c1c17588100d6afddda66eafc9453.tar.gz nixlib-adbb9ff7966c1c17588100d6afddda66eafc9453.tar.bz2 nixlib-adbb9ff7966c1c17588100d6afddda66eafc9453.tar.lz nixlib-adbb9ff7966c1c17588100d6afddda66eafc9453.tar.xz nixlib-adbb9ff7966c1c17588100d6afddda66eafc9453.tar.zst nixlib-adbb9ff7966c1c17588100d6afddda66eafc9453.zip |
dnsmasq: upgrade to 2.71, fixed dnsmasq module
* The module now has systemd config * Add resolveLocalQueries option which sets up it as a dns server for local host (including reasonable setup of resolvconf) * Add "dnsmasq" user for running daemon * Enabled dbus and dnssec support for the package Conflicts: nixos/modules/misc/ids.nix
Diffstat (limited to 'pkgs/tools/networking/dnsmasq/default.nix')
-rw-r--r-- | pkgs/tools/networking/dnsmasq/default.nix | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index cec4057a284f..ba59071d0cef 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ pkgconfig, dbus_libs, nettle, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "dnsmasq-2.71"; @@ -8,8 +8,30 @@ stdenv.mkDerivation rec { sha256 = "1fpzpzja7qr8b4kfdhh4i4sijp62c634yf0xvq2n4p7d5xbzn6a9"; }; + # Can't rely on make flags because of space in one of the parameters + buildPhase = '' + make COPTS="-DHAVE_DNSSEC -DHAVE_DBUS" + ''; + + # make flags used for installation only makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale"; + postInstall = '' + install -Dm644 dbus/dnsmasq.conf $out/etc/dbus-1/system.d/dnsmasq.conf + install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf + + ensureDir $out/share/dbus-1/system-services + cat <<END > $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service + [D-BUS Service] + Name=uk.org.thekelleys.dnsmasq + Exec=$out/sbin/dnsmasq -k -1 + User=root + SystemdService=dnsmasq.service + END + ''; + + buildInputs = [ pkgconfig dbus_libs nettle ]; + meta = { description = "An integrated DNS, DHCP and TFTP server for small networks"; homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html; |