about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/libbpf/default.nix
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2021-01-18 22:50:56 -0800
committerJonathan Ringer <jonringer@users.noreply.github.com>2021-01-19 01:16:25 -0800
commit9bb3fccb5b55326cb3c2c507464a8a28d44d1730 (patch)
tree9d1c0c16cce5e5dcc08115230f6412865487964b /pkgs/os-specific/linux/libbpf/default.nix
parent200bb8c977d81ebdf847d5e6839cd46cd3eb8d4d (diff)
downloadnixlib-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar
nixlib-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.gz
nixlib-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.bz2
nixlib-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.lz
nixlib-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.xz
nixlib-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.zst
nixlib-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.zip
treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
Diffstat (limited to 'pkgs/os-specific/linux/libbpf/default.nix')
-rw-r--r--pkgs/os-specific/linux/libbpf/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index c454fc5f3b1e..2e497584fab8 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig
+{ lib, stdenv, fetchFromGitHub, pkg-config
 , libelf, zlib
 , fetchpatch
 }:
@@ -31,14 +31,14 @@ stdenv.mkDerivation rec {
       --replace '/bin/rm' 'rm'
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libelf zlib ];
 
   sourceRoot = "source/src";
   enableParallelBuilding = true;
   makeFlags = [ "PREFIX=$(out)" ];
 
-  # FIXME: Multi-output requires some fixes to the way the pkgconfig file is
+  # FIXME: Multi-output requires some fixes to the way the pkg-config file is
   # constructed (it gets put in $out instead of $dev for some reason, with
   # improper paths embedded). Don't enable it for now.