From b3592d0b205af19576bf86371c2cf4847a7d6dbf Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 7 Mar 2016 18:26:13 +0100
Subject: dnscrypt-proxy: refactorings

- move build deps to nativeBuildInputs
- use https urls
---
 pkgs/tools/networking/dnscrypt-proxy/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index b98570a7341b..380dd6764119 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -1,25 +1,29 @@
 { stdenv, fetchurl, libsodium, pkgconfig, systemd }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "dnscrypt-proxy-${version}";
   version = "1.6.1";
 
   src = fetchurl {
-    url = "http://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
+    url = "https://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
     sha256 = "16lif3qhyfjpgg54vjlwpslxk90akmbhlpnn1szxm628bmpw6nl9";
   };
 
   configureFlags = ''
-    ${stdenv.lib.optionalString stdenv.isLinux "--with-systemd"}
+    ${optionalString stdenv.isLinux "--with-systemd"}
   '';
 
-  buildInputs = [ pkgconfig libsodium ] ++ stdenv.lib.optional stdenv.isLinux systemd;
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ libsodium ] ++ optional stdenv.isLinux systemd;
 
   meta = {
     description = "A tool for securing communications between a client and a DNS resolver";
-    homepage = http://dnscrypt.org/;
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ joachifm jgeerds ];
-    platforms = stdenv.lib.platforms.all;
+    homepage = https://dnscrypt.org/;
+    license = licenses.isc;
+    maintainers = with maintainers; [ joachifm jgeerds ];
+    platforms = platforms.all;
   };
 }
-- 
cgit 1.4.1