summaryrefslogtreecommitdiffstats
path: root/pkgs/tools/filesystems/nixpart
diff options
context:
space:
mode:
authorBen Siraphob <bensiraphob@gmail.com>2021-01-17 16:17:16 +0700
committerBen Siraphob <bensiraphob@gmail.com>2021-01-17 23:27:27 +0700
commitd6aeae8f90a4935525915431e3b08ebf1b7d5bf3 (patch)
tree0376acde4a65afc15fccb505d35a9fc65fafe55c /pkgs/tools/filesystems/nixpart
parent979e6e67d32a934dcc39dedfd588baf6e3f7ed78 (diff)
pkgs/tools: pkgconfig -> pkg-config (2)
Diffstat (limited to 'pkgs/tools/filesystems/nixpart')
-rw-r--r--pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix4
-rw-r--r--pkgs/tools/filesystems/nixpart/0.4/default.nix6
-rw-r--r--pkgs/tools/filesystems/nixpart/0.4/lvm2.nix6
-rw-r--r--pkgs/tools/filesystems/nixpart/0.4/pyparted.nix4
4 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
index 194819cda169..6e372b75a7d7 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
@@ -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;
diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix
index 8186b1964f8b..7b773a61a5f2 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/default.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix
@@ -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 {
diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
index 25d2fb8ae3b3..ca349c7f42e4 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
@@ -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 =
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
index 48c5252d0ae0..9d1eff2bab77 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
@@ -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 ];