From 119d93e22396f337fb3c74a68db2f2ce3ba81977 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 21 Nov 2014 15:42:11 +0100
Subject: [PATCH] dnscrypt-proxy: minor superficial improvements

- Use upstream description and explicitly set platforms = all
- Coding conventions fix
---
 .../services/networking/dnscrypt-proxy.nix        | 15 ++++++++-------
 pkgs/tools/networking/dnscrypt-proxy/default.nix  |  3 ++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index d847e10a936..26549bfe6f1 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -6,13 +6,14 @@ let
   dnscrypt-proxy = pkgs.dnscrypt-proxy;
   cfg = config.services.dnscrypt-proxy;
   uid = config.ids.uids.dnscrypt-proxy;
-  daemonArgs = [ "--daemonize"
-                 "--user=dnscrypt-proxy"
-                 "--local-address=${cfg.localAddress}:${toString cfg.port}"
-                 (optionalString cfg.tcpOnly "--tcp-only")
-                 "--resolvers-list=${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv"
-                 "--resolver-name=${cfg.resolverName}"
-               ];
+  daemonArgs =
+    [ "--daemonize"
+      "--user=dnscrypt-proxy"
+      "--local-address=${cfg.localAddress}:${toString cfg.port}"
+      (optionalString cfg.tcpOnly "--tcp-only")
+      "--resolvers-list=${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv"
+      "--resolver-name=${cfg.resolverName}"
+    ];
 in
 
 {
diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index d0205be35b9..50c8dae902c 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -11,9 +11,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ libsodium ];
 
   meta = {
-    description = "A DNS proxy which encrypts and authenticates requests using the DNSCrypt protocol.";
+    description = "A tool for securing communications between a client and a DNS resolver";
     homepage = http://dnscrypt.org/;
     license = with stdenv.lib.licenses; [ isc ];
     maintainers = with stdenv.lib.maintainers; [ joachifm ];
+    platform = stdenv.lib.platforms.all;
   };
 }