public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/modules: pkgconfig -> pkg-config

This commit is contained in:
Jonathan Ringer 2021-01-19 00:59:07 -08:00 committed by Jonathan Ringer
parent 4edbbe523c
commit e2fcf81d2a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/installer/tools/nixos-option/default.nix
View File

@ -1,8 +1,8 @@
{lib, stdenv, boost, cmake, pkgconfig, nix, ... }: {lib, stdenv, boost, cmake, pkg-config, nix, ... }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nixos-option"; name = "nixos-option";
src = ./.; src = ./.;
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ boost nix ]; buildInputs = [ boost nix ];
meta = { meta = {
license = stdenv.lib.licenses.lgpl2Plus; license = stdenv.lib.licenses.lgpl2Plus;

4
nixos/modules/services/networking/dnscrypt-wrapper.nix
View File

@ -83,7 +83,7 @@ let
# correctly implement key rotation of dnscrypt-wrapper ephemeral keys. # correctly implement key rotation of dnscrypt-wrapper ephemeral keys.
dnscrypt-proxy1 = pkgs.callPackage dnscrypt-proxy1 = pkgs.callPackage
({ stdenv, fetchFromGitHub, autoreconfHook ({ stdenv, fetchFromGitHub, autoreconfHook
, pkgconfig, libsodium, ldns, openssl, systemd }: , pkg-config, libsodium, ldns, openssl, systemd }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dnscrypt-proxy"; pname = "dnscrypt-proxy";
@ -98,7 +98,7 @@ let
configureFlags = optional stdenv.isLinux "--with-systemd"; configureFlags = optional stdenv.isLinux "--with-systemd";
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
# <ldns/ldns.h> depends on <openssl/ssl.h> # <ldns/ldns.h> depends on <openssl/ssl.h>
buildInputs = [ libsodium openssl.dev ldns ] ++ optional stdenv.isLinux systemd; buildInputs = [ libsodium openssl.dev ldns ] ++ optional stdenv.isLinux systemd;