pkgs/tools: pkgconfig -> pkg-config (2)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, lvm2, libgcrypt, libuuid, pkgconfig, popt
|
||||
{ lib, stdenv, fetchurl, fetchpatch, lvm2, libgcrypt, libuuid, pkg-config, popt
|
||||
, enablePython ? true, python ? null
|
||||
}:
|
||||
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
configureFlags = [ "--enable-cryptsetup-reencrypt" ]
|
||||
++ lib.optional enablePython "--enable-python";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ lvm2 libgcrypt libuuid popt ]
|
||||
++ lib.optional enablePython python;
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ let
|
||||
|
||||
cryptsetup = import ./cryptsetup.nix {
|
||||
inherit lib stdenv fetchurl python;
|
||||
inherit (pkgs) fetchpatch pkgconfig libgcrypt libuuid popt lvm2;
|
||||
inherit (pkgs) fetchpatch pkg-config libgcrypt libuuid popt lvm2;
|
||||
};
|
||||
|
||||
dmraid = import ./dmraid.nix {
|
||||
@@ -27,7 +27,7 @@ let
|
||||
|
||||
lvm2 = import ./lvm2.nix {
|
||||
inherit lib stdenv fetchurl;
|
||||
inherit (pkgs) fetchpatch pkgconfig util-linux systemd coreutils;
|
||||
inherit (pkgs) fetchpatch pkg-config util-linux systemd coreutils;
|
||||
};
|
||||
|
||||
multipath_tools = import ./multipath-tools.nix {
|
||||
@@ -50,7 +50,7 @@ let
|
||||
|
||||
pyparted = import ./pyparted.nix {
|
||||
inherit lib stdenv fetchurl python buildPythonApplication parted;
|
||||
inherit (pkgs) pkgconfig e2fsprogs;
|
||||
inherit (pkgs) pkg-config e2fsprogs;
|
||||
};
|
||||
|
||||
in buildPythonApplication rec {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, systemd, util-linux, coreutils }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, systemd, util-linux, coreutils }:
|
||||
|
||||
let
|
||||
v = "2.02.106";
|
||||
@@ -28,11 +28,11 @@ stdenv.mkDerivation {
|
||||
"--disable-readline"
|
||||
"--enable-udev_rules"
|
||||
"--enable-udev_sync"
|
||||
"--enable-pkgconfig"
|
||||
"--enable-pkg-config"
|
||||
"--enable-applib"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ systemd ];
|
||||
|
||||
preConfigure =
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, python, buildPythonApplication, parted, e2fsprogs }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, python, buildPythonApplication, parted, e2fsprogs }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "pyparted";
|
||||
@@ -24,7 +24,7 @@ buildPythonApplication rec {
|
||||
PATH="${parted}/sbin:$PATH"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
propagatedBuildInputs = [ parted ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user