···

       
1
       
1
       
-
       
{lib, stdenv, boost, cmake, pkgconfig, nix, ... }:

     

       
1
       
1
       
+
       
{lib, stdenv, boost, cmake, pkg-config, nix, ... }:

     

       
2
       
2
       
 
       
stdenv.mkDerivation rec {

     

       
3
       
3
       
 
       
  name = "nixos-option";

     

       
4
       
4
       
 
       
  src = ./.;

     

       
5
       
5
       
-
       
  nativeBuildInputs = [ cmake pkgconfig ];

     

       
5
       
5
       
+
       
  nativeBuildInputs = [ cmake pkg-config ];

     

       
6
       
6
       
 
       
  buildInputs = [ boost nix ];

     

       
7
       
7
       
 
       
  meta = {

     

       
8
       
8
       
 
       
    license = stdenv.lib.licenses.lgpl2Plus;

     

···

       
83
       
83
       
 
       
  # correctly implement key rotation of dnscrypt-wrapper ephemeral keys.

     

       
84
       
84
       
 
       
  dnscrypt-proxy1 = pkgs.callPackage

     

       
85
       
85
       
 
       
    ({ stdenv, fetchFromGitHub, autoreconfHook

     

       
86
       
86
       
-
       
    , pkgconfig, libsodium, ldns, openssl, systemd }:

     

       
86
       
86
       
+
       
    , pkg-config, libsodium, ldns, openssl, systemd }:

     

       
87
       
87
       
 
       


     

       
88
       
88
       
 
       
    stdenv.mkDerivation rec {

     

       
89
       
89
       
 
       
      pname = "dnscrypt-proxy";

     
···

       
98
       
98
       
 
       


     

       
99
       
99
       
 
       
      configureFlags = optional stdenv.isLinux "--with-systemd";

     

       
100
       
100
       
 
       


     

       
101
       
101
       
-
       
      nativeBuildInputs = [ autoreconfHook pkgconfig ];

     

       
101
       
101
       
+
       
      nativeBuildInputs = [ autoreconfHook pkg-config ];

     

       
102
       
102
       
 
       


     

       
103
       
103
       
 
       
      # <ldns/ldns.h> depends on <openssl/ssl.h>

     

       
104
       
104
       
 
       
      buildInputs = [ libsodium openssl.dev ldns ] ++ optional stdenv.isLinux systemd;