diff options
Diffstat (limited to 'pkgs/tools/filesystems')
54 files changed, 110 insertions, 110 deletions
diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 59add4b4c21..68199a0938e 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase, qttools }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkg-config, qtbase, qttools }: mkDerivation rec { pname = "android-file-transfer"; @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "125rq8ji83nw6chfw43i0h9c38hjqh1qjibb0gnf9wrigar9zc8b"; }; - nativeBuildInputs = [ cmake readline pkgconfig ]; + nativeBuildInputs = [ cmake readline pkg-config ]; buildInputs = [ fuse qtbase qttools ]; meta = with lib; { diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index 69beb9e7e6f..e3f9d8505fc 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, fuse, libarchive }: +{ lib, stdenv, fetchurl, pkg-config, fuse, libarchive }: let name = "archivemount-0.9.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1cy5b6qril9c3ry6fv7ir87s8iyy5vxxmbyx90dm86fbra0vjaf5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse libarchive ]; meta = { diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index 341d772e82d..e89828dd750 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, fuse, xz }: +{ lib, stdenv, fetchurl, pkg-config, fuse, xz }: stdenv.mkDerivation rec { pname = "avfs"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1psh8k7g7rb0gn7aygbjv86kxyi9xq07barxksa99nnmq3lc2kjg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse xz ]; diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index f9c2b470026..ea424865919 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, util-linux, bash }: +{ lib, stdenv, fetchurl, pkg-config, util-linux, bash }: stdenv.mkDerivation rec { pname = "bcache-tools"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ util-linux ]; # * Remove broken install rules (they ignore $PREFIX) for stuff we don't need diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 949acef695e..8ab82b67226 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils +{ lib, stdenv, fetchFromGitHub, pkg-config, attr, libuuid, libscrypt, libsodium, keyutils , liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages , fuseSupport ? false, fuse3 ? null }: @@ -22,7 +22,7 @@ stdenv.mkDerivation { "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libuuid libscrypt libsodium keyutils liburcu zlib libaio diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index e8972b36f33..a8baeaf3ef5 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fuse, pkgconfig }: +{ lib, stdenv, fetchurl, fuse, pkg-config }: stdenv.mkDerivation rec { version = "1.14.8"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { dontStrip = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse ]; postFixup = '' ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix index 2156758f68e..651e93f4213 100644 --- a/pkgs/tools/filesystems/blobfuse/default.nix +++ b/pkgs/tools/filesystems/blobfuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, curl, gnutls, libgcrypt, libuuid, fuse }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, curl, gnutls, libgcrypt, libuuid, fuse }: stdenv.mkDerivation rec { pname = "blobfuse"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; buildInputs = [ curl gnutls libgcrypt libuuid fuse ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { description = "Mount an Azure Blob storage as filesystem through FUSE"; diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index 4ccec06050d..5637b9af291 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, curl, fuse, libxml2, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, curl, fuse, libxml2, pkg-config }: let srcs = { @@ -35,7 +35,7 @@ in stdenv.mkDerivation { patches = [ ./work-around-API-borkage.patch ]; buildInputs = [ curl fuse libxml2 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildFlags = [ "static" ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 3bc8dc5875f..84ceea384c3 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo +{ lib, stdenv, fetchurl, pkg-config, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3 }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt python3 python3.pkgs.setuptools ]; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index c19f095c649..c11828e24ca 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -1,7 +1,7 @@ { stdenv, runCommand, fetchurl , fetchpatch , ensureNewerSourcesHook -, cmake, pkgconfig +, cmake, pkg-config , which, git , boost, python3Packages , libxml2, zlib, lz4 @@ -139,7 +139,7 @@ in rec { nativeBuildInputs = [ cmake - pkgconfig which git python3Packages.wrapPython makeWrapper + pkg-config which git python3Packages.wrapPython makeWrapper python3Packages.python # for the toPythonPath function (ensureNewerSourcesHook { year = "1980"; }) ]; diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index 345b942411c..cfe80cfce65 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, fuse, glib, attr }: +{ lib, stdenv, fetchurl, pkg-config, fuse, glib, attr }: stdenv.mkDerivation rec { name = "ciopfs-0.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0sr9i9b3qfwbfvzvk00yrrg3x2xqk1njadbldkvn7hwwa4z5bm9l"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse glib attr ]; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 5573acc1a8c..3777c4e7cb1 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, cmake, pkgconfig, python, gtest +, cmake, pkg-config, python, gtest , boost, cryptopp, curl, fuse, openssl }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { --replace "(4.5L*1024*1024*1024)" "(0.5L*1024*1024*1024)" ''; - nativeBuildInputs = [ cmake gtest pkgconfig python ]; + nativeBuildInputs = [ cmake gtest pkg-config python ]; buildInputs = [ boost cryptopp curl fuse openssl ]; diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index 3e59a286be3..4bfa22838ad 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, fuse, curl, pkgconfig, glib, zlib}: +{lib, stdenv, fetchurl, fuse, curl, pkg-config, glib, zlib}: stdenv.mkDerivation { name = "curlftpfs-0.9.2"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = "mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz"; sha256 = "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [fuse curl glib zlib]; doCheck = false; # fails, doesn't work well too, btw diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix index 849360f5374..497a6ad0e0a 100644 --- a/pkgs/tools/filesystems/disorderfs/default.nix +++ b/pkgs/tools/filesystems/disorderfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, fuse, attr, asciidoc }: +{ lib, stdenv, fetchurl, pkg-config, fuse, attr, asciidoc }: stdenv.mkDerivation rec { pname = "disorderfs"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0xlsl6cw1p0d92crknrcf4iabgig0185dzp80qxh9iyjy42d27gk"; }; - nativeBuildInputs = [ pkgconfig asciidoc ]; + nativeBuildInputs = [ pkg-config asciidoc ]; buildInputs = [ fuse attr ]; diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix index 824788fe24f..f5b0a0315df 100644 --- a/pkgs/tools/filesystems/djmount/default.nix +++ b/pkgs/tools/filesystems/djmount/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, fuse }: +{ lib, stdenv, fetchurl, pkg-config, fuse }: stdenv.mkDerivation rec { pname = "djmount"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0kqf0cy3h4cfiy5a2sigmisx0lvvsi1n0fbyb9ll5gacmy1b8nxa"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse]; meta = { diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 9efe64f4723..14d054364fd 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libiconv }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv }: stdenv.mkDerivation rec { pname = "dosfstools"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1a2zn1655d5f1m6jp9vpn3bp8yfxhcmxx3mx23ai9hmxiydiykr1"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ] + nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional stdenv.isDarwin libiconv; configureFlags = [ "--enable-compat-symlinks" ]; diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index 62df5ee07c6..bbc346d46f7 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, libgcrypt -, pkgconfig, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite }: +, pkg-config, glib, linuxHeaders ? stdenv.cc.libc.linuxHeaders, sqlite }: stdenv.mkDerivation rec { pname = "duperemove"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1a87mka2sfzhbch2jip6wlvvs0glxq9lqwmyrp359d1rmwwmqiw9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgcrypt glib linuxHeaders sqlite ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index d48c92ebfc3..ffe716dceea 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pkgconfig, libuuid, gettext, texinfo +{ lib, stdenv, buildPackages, fetchurl, fetchpatch, pkg-config, libuuid, gettext, texinfo , shared ? !stdenv.hostPlatform.isStatic }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "info" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig texinfo ]; + nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ libuuid gettext ]; # Only use glibc's __GNUC_PREREQ(X,Y) (checks if compiler is gcc version >= X.Y) when using glibc diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/pkgs/tools/filesystems/e2tools/default.nix index 1f4fdc32318..8621298275e 100644 --- a/pkgs/tools/filesystems/e2tools/default.nix +++ b/pkgs/tools/filesystems/e2tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, e2fsprogs }: +{ lib, stdenv, fetchurl, pkg-config, e2fsprogs }: stdenv.mkDerivation rec { pname = "e2tools"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "16wlc54abqz06dpipjdkw58bncpkxlj5f55lkzy07k3cg0bqwg2f"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ e2fsprogs ]; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 4d28fc6a9e8..2b88dde1531 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, cmake, pkgconfig, perl +, cmake, pkg-config, perl , gettext, fuse, openssl, tinyxml2 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gettext fuse openssl tinyxml2 ]; - nativeBuildInputs = [ cmake pkgconfig perl ]; + nativeBuildInputs = [ cmake pkg-config perl ]; cmakeFlags = [ "-DUSE_INTERNAL_TINYXML=OFF" diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix index 2d6eaf8e978..8cb552cdc70 100644 --- a/pkgs/tools/filesystems/exfat/default.nix +++ b/pkgs/tools/filesystems/exfat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fuse }: stdenv.mkDerivation rec { pname = "exfat"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1q29pcysv747y6dis07953dkax8k9x50b5gg99gpz6rr46xwgkgb"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse ]; meta = with lib; { diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index 35a087dbd7b..4b3d5c9ac1e 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkgconfig }: +{ lib, stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkg-config }: stdenv.mkDerivation rec { pname = "f2fs-tools"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "06ss05n87i1c3149qb3n7j1qp2scv3g2adx0v6ljkl59ab9b5saj"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libselinux libuuid ]; patches = [ ./f2fs-tools-cross-fix.patch ]; diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix index 61170f469e8..aaffc70e10d 100644 --- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fuse, p7zip, autoconf, automake, pkgconfig, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, fuse, p7zip, autoconf, automake, pkg-config, makeWrapper }: stdenv.mkDerivation rec { pname = "fuse-7z-ng"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "17v1gcmg5q661b047zxjar735i4d3508dimw1x3z1pk4d1zjhp3x"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse autoconf automake makeWrapper ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index f8c4ead50f2..7e44e7c15f9 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, fuse, glib, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, fuse, glib, zlib }: stdenv.mkDerivation rec { pname = "fuseiso"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse glib zlib ]; diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index 23c38e6a6d3..b3ca1ae8394 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libconfuse, gettext }: +{ lib, stdenv, fetchurl, pkg-config, libconfuse, gettext }: stdenv.mkDerivation rec { pname = "genimage"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0y4h8x8lqxam8m90rdfq8cg5137kvilxr3d1qzddpx7nxpvmmwv9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libconfuse gettext ]; postInstall = '' diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index a3f50a7f978..5145889407e 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,5 +1,5 @@ {lib, stdenv, fetchFromGitHub, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline, - autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite, + autoconf, automake, libtool, pkg-config, zlib, libaio, libxml2, acl, sqlite, liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, rsync, glibc, rpcsvc-proto, libtirpc @@ -15,7 +15,7 @@ let buildInputs = [ fuse bison flex_2_5_35 openssl ncurses readline - autoconf automake libtool pkgconfig zlib libaio libxml2 + autoconf automake libtool pkg-config zlib libaio libxml2 acl sqlite liburcu attr makeWrapper util-linux libtirpc (python3.withPackages (pkgs: [ pkgs.flask diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 605e341c4d7..bd6e0fe67fc 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -1,4 +1,4 @@ -{ pkgconfig, libusb1, buildGoPackage, fetchgit }: +{ pkg-config, libusb1, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "go-mtpfs"; @@ -7,7 +7,7 @@ buildGoPackage rec { goPackagePath = "github.com/hanwen/go-mtpfs"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; src = fetchgit { diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix index 7392b474840..68475b9e290 100644 --- a/pkgs/tools/filesystems/grive2/default.nix +++ b/pkgs/tools/filesystems/grive2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }: +{ lib, stdenv, fetchFromGitHub, pkg-config, yajl, cmake, libgcrypt, curl, expat, boost, libiberty }: stdenv.mkDerivation rec { version = "0.5.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1kv34ys8qarjsxpb1kd8dp7b3b4ycyiwjzd6mg97d3jk7405g6nm"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libgcrypt yajl curl expat stdenv boost libiberty ]; diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index 2cb1dba28b6..c62703c7b52 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, fuse, openssl, asciidoc +{ fetchurl, lib, stdenv, pkg-config, fuse, openssl, asciidoc , docbook_xml_dtd_45, docbook_xsl , libxml2, libxslt }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig fuse openssl + [ pkg-config fuse openssl asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix index 5bd140e6cdf..4f40bd37abe 100644 --- a/pkgs/tools/filesystems/hubicfuse/default.nix +++ b/pkgs/tools/filesystems/hubicfuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, curl, openssl, fuse, libxml2, json_c, file }: +{ lib, stdenv, fetchFromGitHub, pkg-config, curl, openssl, fuse, libxml2, json_c, file }: stdenv.mkDerivation rec { pname = "hubicfuse"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1x988hfffxgvqxh083pv3lj5031fz03sbgiiwrjpaiywfbhm8ffr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl openssl fuse libxml2 json_c file ]; postInstall = '' install hubic_token $out/bin diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/tools/filesystems/ifuse/default.nix index b262080d182..4abb50b8bd7 100644 --- a/pkgs/tools/filesystems/ifuse/default.nix +++ b/pkgs/tools/filesystems/ifuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, usbmuxd, fuse, libimobiledevice }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, usbmuxd, fuse, libimobiledevice }: stdenv.mkDerivation rec { pname = "ifuse"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1r12y3h1j7ikkwk874h9969kr4ksyamvrwywx19ml6rsr01arw84"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig fuse usbmuxd libimobiledevice ]; + nativeBuildInputs = [ autoreconfHook pkg-config fuse usbmuxd libimobiledevice ]; meta = with lib; { homepage = "https://github.com/libimobiledevice/ifuse"; diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix index fe45c953988..a9d3c40aae3 100644 --- a/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/pkgs/tools/filesystems/jmtpfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, file, fuse, libmtp }: +{ lib, stdenv, fetchFromGitHub, pkg-config, file, fuse, libmtp }: let version = "0.5"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "JasonFerrara"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ file fuse libmtp ]; meta = with lib; { diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index 785a9225cf3..766ac1f82ea 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -12,7 +12,7 @@ , docbook_xml_dtd_412 , docbook_xsl , boost -, pkgconfig +, pkg-config , judy , pam , spdlog @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-rgaFhJvmA1RVDL4+vQLMC0GrdlgUlvJeZ5/JJ67C20Q="; }; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ db fuse asciidoc libxml2 libxslt docbook_xml_dtd_412 docbook_xsl diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 07c74c58c81..0c9a6af9a6e 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }: +{ lib, stdenv, fetchFromGitHub, automake, autoconf, pkg-config, gettext, libtool, pandoc, which, attr, libiconv }: stdenv.mkDerivation rec { pname = "mergerfs"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - automake autoconf pkgconfig gettext libtool pandoc which + automake autoconf pkg-config gettext libtool pandoc which ]; prePatch = '' sed -i -e '/chown/d' -e '/chmod/d' libfuse/Makefile diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix index 894e9e7a66c..3a0d0ab2f65 100644 --- a/pkgs/tools/filesystems/mhddfs/default.nix +++ b/pkgs/tools/filesystems/mhddfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fuse, pkgconfig, attr, uthash }: +{ lib, stdenv, fetchurl, fuse, pkg-config, attr, uthash }: stdenv.mkDerivation rec { pname = "mhddfs"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "14ggmh91vv69fp2qpz0nxp0hprlw2wsijss2k2485hb0ci4cabvh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse attr uthash ]; patches = [ diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index 0d0f13b7c2b..e38b040ec0d 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -3,7 +3,7 @@ , makeWrapper , python , fuse -, pkgconfig +, pkg-config , libpcap , zlib }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0dap9dqwwx8adma6arxg015riqc86cmjv2m44hk0kz7s24h79ipq"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ fuse libpcap zlib python ]; diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index 12b64573c40..8b241e9026e 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, flac, fuse, lame, libid3tag, pkgconfig }: +{ lib, stdenv, fetchurl, flac, fuse, lame, libid3tag, pkg-config }: stdenv.mkDerivation rec { pname = "mp3fs"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-statfs-operation.patch ]; buildInputs = [ flac fuse lame libid3tag ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index 1db4b473e9d..d753e7c5204 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, cmocka, acl, libuuid, lzo, zlib, zstd }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, cmocka, acl, libuuid, lzo, zlib, zstd }: stdenv.mkDerivation rec { pname = "mtd-utils"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1lijl89l7hljx8xx70vrz9srd3h41v5gh4b0lvqnlv831yvyh5cd"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ] ++ lib.optional doCheck cmocka; + nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional doCheck cmocka; buildInputs = [ acl libuuid lzo zlib zstd ]; configureFlags = [ diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index 295b7a0e5e5..e0b1cffe4dd 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchurl, pkgconfig, fuse, libmtp, glib, libmad, libid3tag }: +{ lib, stdenv, fetchurl, pkg-config, fuse, libmtp, glib, libmad, libid3tag }: stdenv.mkDerivation rec { name = "mtpfs-1.1"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse libmtp glib libid3tag libmad ]; # adding LIBS is a hack, duno why it does not find libid3tag.so by adding buildInputs diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index b08c4b9c71d..486963f44b9 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, autoreconfHook, pkgconfig, perl, python +{ fetchurl, lib, stdenv, autoreconfHook, pkg-config, perl, python , db, libgcrypt, avahi, libiconv, pam, openssl, acl , ed, libtirpc, libevent }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ./omitLocalstatedirCreation.patch ]; - nativeBuildInputs = [ autoreconfHook pkgconfig perl python python.pkgs.wrapPython ]; + nativeBuildInputs = [ autoreconfHook pkg-config perl python python.pkgs.wrapPython ]; buildInputs = [ db libgcrypt avahi libiconv pam openssl acl libevent ]; diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index 194819cda16..6e372b75a7d 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 8186b1964f8..7b773a61a5f 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 25d2fb8ae3b..ca349c7f42e 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 48c5252d0ae..9d1eff2bab7 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 ]; diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 6c67dfc5e1b..7039584ea90 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -1,5 +1,5 @@ {lib, stdenv, fetchurl, util-linux, libuuid -, crypto ? false, libgcrypt, gnutls, pkgconfig}: +, crypto ? false, libgcrypt, gnutls, pkg-config}: stdenv.mkDerivation rec { pname = "ntfs3g"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; buildInputs = [ libuuid ] ++ lib.optionals crypto [ gnutls libgcrypt ]; - nativeBuildInputs = lib.optional crypto pkgconfig; + nativeBuildInputs = lib.optional crypto pkg-config; src = fetchurl { url = "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz"; diff --git a/pkgs/tools/filesystems/romdirfs/default.nix b/pkgs/tools/filesystems/romdirfs/default.nix index 12b6978af62..b4fa173706e 100644 --- a/pkgs/tools/filesystems/romdirfs/default.nix +++ b/pkgs/tools/filesystems/romdirfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, fuse }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, fuse }: stdenv.mkDerivation rec { pname = "romdirfs"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1jbsmpklrycz5q86qmzvbz4iz2g5fvd7p9nca160aw2izwpws0g7"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fuse ]; meta = with lib; { diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index b617414aac8..650fd713a0e 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig +, autoreconfHook, pkg-config , fuse, curl, expat }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "archiecobbs"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse curl expat ]; autoreconfPhase = '' diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 3635119bc9f..e0b42711d22 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse, osxfuse }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse, osxfuse }: stdenv.mkDerivation rec { pname = "s3fs-fuse"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl openssl libxml2 ] ++ lib.optionals stdenv.isLinux [ fuse ] ++ lib.optionals stdenv.isDarwin [ osxfuse ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "--with-openssl" diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 7967be70106..05d7189fbaa 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fuse, samba, pkgconfig, glib, autoconf, attr, libsecret }: +{ lib, stdenv, fetchurl, fuse, samba, pkg-config, glib, autoconf, attr, libsecret }: stdenv.mkDerivation rec { pname = "smbnetfs"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "19x9978k90w9a65lrpsphk7swsq8zkws9jc27q4zbndrm0r2snr0"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ fuse samba glib attr libsecret ]; postPatch = '' diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 0c977799db8..593004d552c 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, doxygen, graphviz, perl, pkgconfig +{ stdenv, lib, fetchurl, doxygen, graphviz, perl, pkg-config , lz4, lzo, xz, zlib, zstd }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "120x2hlbhpm90bzxz70z764552ffrjpidmp1y6gafx70zp0hrks4"; }; - nativeBuildInputs = [ doxygen graphviz pkgconfig perl ]; + nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; buildInputs = [ zlib xz lz4 lzo zstd ]; meta = with lib; { diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index 1a57cc8a000..a2e930f9155 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, fuse, - pkgconfig, lz4, xz, zlib, lzo, zstd }: + pkg-config, lz4, xz, zlib, lzo, zstd }: with lib; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "062s77y32p80vc24a79z31g90b9wxzvws1xvicgx5fn1pd0xa0q6"; }; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; buildInputs = [ lz4 xz zlib lzo zstd fuse ]; meta = { diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix index 2d4f3b22a77..b60dccc4e68 100644 --- a/pkgs/tools/filesystems/vmfs-tools/default.nix +++ b/pkgs/tools/filesystems/vmfs-tools/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , asciidoc , docbook_xsl , fuse @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "14y412ww5hxk336ils62s3fwykfh6mx1j0iiaa5cwc615pi6qvi4"; }; - nativeBuildInputs = [ asciidoc docbook_xsl libxslt pkgconfig ]; + nativeBuildInputs = [ asciidoc docbook_xsl libxslt pkg-config ]; buildInputs = [ fuse libuuid ]; diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index d32138f184b..98377365738 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, glib, neon, fuse, pkgconfig}: +{lib, stdenv, fetchurl, glib, neon, fuse, pkg-config}: stdenv.mkDerivation { name = "wdfs-fuse-1.4.2"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = "http://noedler.de/projekte/wdfs/wdfs-1.4.2.tar.gz"; sha256 = "fcf2e1584568b07c7f3683a983a9be26fae6534b8109e09167e5dff9114ba2e5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [fuse glib neon]; meta = with lib; { diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 3e3c26329c4..009c5e05d5d 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchpatch, fetchurl, autoconf, automake, gettext, libtool, pkgconfig +{ lib, stdenv, buildPackages, fetchpatch, fetchurl, autoconf, automake, gettext, libtool, pkg-config , icu, libuuid, readline, inih }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ - autoconf automake libtool gettext pkgconfig + autoconf automake libtool gettext pkg-config libuuid # codegen tool uses libuuid ]; buildInputs = [ readline icu inih ]; |