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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-01-19 13:50:04 +01:00
parent 2d91ad963f 1d26caa746
commit fc7bd322df
1696 changed files with 4737 additions and 3956 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/afuse/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook, fuse }:
{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, fuse }:
stdenv.mkDerivation {
name = "afuse-0.4.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1sfhicmxppkvdd4z9klfn63snb71gr9hff6xij1gzk94xg6m0ycc";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ fuse ];
meta = {
pkgs/os-specific/linux/alsa-plugins/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }:
{ stdenv, fetchurl, lib, pkg-config, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }:
stdenv.mkDerivation rec {
pname = "alsa-plugins";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0z9k3ssbfk2ky2w13avgyf202j1drsz9sv3834bp33cj1i2hc3qw";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
# ToDo: a52, etc.?
buildInputs =
pkgs/os-specific/linux/alsa-tools/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, alsaLib, pkgconfig, gtk2, gtk3, fltk13 }:
{ lib, stdenv, fetchurl, alsaLib, pkg-config, gtk2, gtk3, fltk13 }:
# Comes from upstream as as bundle of several tools,
# some use gtk2, some gtk3 (and some even fltk13).
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0jbkjmq038zapj66a7nkppdf644v2mwj581xbmh6k4i8w6mcglxz";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsaLib gtk2 gtk3 fltk13 ];
patchPhase = ''
pkgs/os-specific/linux/apparmor/default.nix
+4 -4
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchpatch, makeWrapper, autoreconfHook
, pkgconfig, which
, pkg-config, which
, flex, bison
, linuxHeaders ? stdenv.cc.libc.linuxHeaders
, gawk
@@ -67,7 +67,7 @@ let
autoreconfHook
bison
flex
pkgconfig
pkg-config
swig
ncurses
which
@@ -154,7 +154,7 @@ let
src = apparmor-sources;
nativeBuildInputs = [
pkgconfig
pkg-config
libapparmor
gawk
which
@@ -206,7 +206,7 @@ let
name = "apparmor-pam-${apparmor-version}";
src = apparmor-sources;
nativeBuildInputs = [ pkgconfig which ];
nativeBuildInputs = [ pkg-config which ];
buildInputs = [ libapparmor pam ];
pkgs/os-specific/linux/batman-adv/alfred.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }:
{ lib, stdenv, fetchurl, pkg-config, gpsd, libcap, libnl }:
let cfg = import ./version.nix; in
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
sha256 = cfg.sha256.${pname};
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gpsd libcap libnl ];
preBuild = ''
makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config"
makeFlags="PREFIX=$out PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"
'';
meta = {
pkgs/os-specific/linux/batman-adv/batctl.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, libnl }:
{ lib, stdenv, fetchurl, pkg-config, libnl }:
let cfg = import ./version.nix; in
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
sha256 = cfg.sha256.${pname};
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libnl ];
preBuild = ''
makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config"
makeFlags="PREFIX=$out PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config"
'';
meta = {
pkgs/os-specific/linux/bluez/default.nix
+2 -2
View File
@@ -6,7 +6,7 @@
, glib
, json_c
, libical
, pkgconfig
, pkg-config
, python3
, readline
, systemd
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
];
nativeBuildInputs = [
pkgconfig
pkg-config
python3.pkgs.wrapPython
];
pkgs/os-specific/linux/bolt/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, stdenv
, meson
, ninja
, pkgconfig
, pkg-config
, fetchFromGitLab
, fetchpatch
, python3
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
libxslt
meson
ninja
pkgconfig
pkg-config
] ++ lib.optional (!doCheck) python3;
buildInputs = [
pkgs/os-specific/linux/bpftrace/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub
, cmake, pkgconfig, flex, bison
, cmake, pkg-config, flex, bison
, llvmPackages, kernel, elfutils
, libelf, libbfd, libbpf, libopcodes, bcc
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
libbpf libbfd libopcodes
];
nativeBuildInputs = [ cmake pkgconfig flex bison ]
nativeBuildInputs = [ cmake pkg-config flex bison ]
# libelf is incompatible with elfutils-libelf
++ lib.filter (x: x != libelf) kernel.moduleBuildDependencies;
pkgs/os-specific/linux/btfs/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
, python3, boost, fuse, libtorrent-rasterbar, curl }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1cfjhyn9cjyyxyd0f08b2ra258pzkljwvkj0iwrjpd0nrbl6wkq5";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
boost fuse libtorrent-rasterbar curl python3
];
pkgs/os-specific/linux/cifs-utils/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkgconfig
{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkg-config
, kerberos, keyutils, pam, talloc }:
stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q";
};
nativeBuildInputs = [ autoreconfHook docutils pkgconfig ];
nativeBuildInputs = [ autoreconfHook docutils pkg-config ];
buildInputs = [ kerberos keyutils pam talloc ];
pkgs/os-specific/linux/conky/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ config, lib, stdenv, fetchFromGitHub, pkgconfig, cmake
{ config, lib, stdenv, fetchFromGitHub, pkg-config, cmake
# dependencies
, glib, libXinerama
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lgcc_s";
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ glib libXinerama ]
++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ]
++ optional ncursesSupport ncurses
pkgs/os-specific/linux/conntrack-tools/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, flex, bison, pkgconfig, libmnl, libnfnetlink
{ fetchurl, lib, stdenv, flex, bison, pkg-config, libmnl, libnfnetlink
, libnetfilter_conntrack, libnetfilter_queue, libnetfilter_cttimeout
, libnetfilter_cthelper, systemd
, libtirpc
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
libmnl libnfnetlink libnetfilter_conntrack libnetfilter_queue
libnetfilter_cttimeout libnetfilter_cthelper systemd libtirpc
];
nativeBuildInputs = [ flex bison pkgconfig ];
nativeBuildInputs = [ flex bison pkg-config ];
meta = with lib; {
homepage = "http://conntrack-tools.netfilter.org/";
pkgs/os-specific/linux/crda/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkgconfig, python3Packages, wireless-regdb }:
{ lib, stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkg-config, python3Packages, wireless-regdb }:
stdenv.mkDerivation rec {
pname = "crda";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libgcrypt libnl ];
nativeBuildInputs = [
pkgconfig
pkg-config
python3Packages.pycrypto
];
pkgs/os-specific/linux/criu/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables
, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig
, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config
, which, python3, makeWrapper, docbook_xml_dtd_45 }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython ];
nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython ];
buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet iptables ];
propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ];
pkgs/os-specific/linux/cryptsetup/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, lvm2, json_c
, openssl, libuuid, pkgconfig, popt }:
, openssl, libuuid, pkg-config, popt }:
stdenv.mkDerivation rec {
pname = "cryptsetup";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
"--with-crypto_backend=openssl"
];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ lvm2 json_c openssl libuuid popt ];
doCheck = true;
pkgs/os-specific/linux/dbus-broker/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, docutils, meson, ninja, pkgconfig
{ lib, stdenv, fetchFromGitHub, docutils, meson, ninja, pkg-config
, dbus, linuxHeaders, systemd }:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
nativeBuildInputs = [ docutils meson ninja pkgconfig ];
nativeBuildInputs = [ docutils meson ninja pkg-config ];
buildInputs = [ dbus linuxHeaders systemd ];
pkgs/os-specific/linux/directvnc/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, directfb, zlib, libjpeg, xorgproto }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, directfb, zlib, libjpeg, xorgproto }:
stdenv.mkDerivation {
pname = "directvnc";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "16x7mr7x728qw7nbi6rqhrwsy73zsbpiz8pbgfzfl2aqhfdiz88b";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ directfb zlib libjpeg xorgproto ];
pkgs/os-specific/linux/dpdk/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, lib
, kernel
, fetchurl
, pkgconfig, meson, ninja
, pkg-config, meson, ninja
, libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap
, doxygen, python3
, shared ? false }:
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
doxygen
meson
ninja
pkgconfig
pkg-config
python3
python3.pkgs.sphinx
];
pkgs/os-specific/linux/dropwatch/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
, libnl, readline, libbfd, ncurses, zlib }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1qmax0l7z1qik42c949fnvjh5r6awk4gpgzdsny8iwnmwzjyp8b8";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libbfd libnl ncurses readline zlib ];
# To avoid running into https://sourceware.org/bugzilla/show_bug.cgi?id=14243 we need to define:
pkgs/os-specific/linux/ell/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, stdenv
, fetchgit
, autoreconfHook
, pkgconfig
, pkg-config
, dbus
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [
pkgconfig
pkg-config
autoreconfHook
];
pkgs/os-specific/linux/erofs-utils/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, fuse, libuuid, lz4 }:
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, fuse, libuuid, lz4 }:
stdenv.mkDerivation rec {
pname = "erofs-utils";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "07hvijq2hsn3gg1kb8abrfk23n83j57yx8kyv4wqgwhhvd30myjc";
};
buildInputs = [ autoreconfHook pkgconfig fuse libuuid lz4 ];
buildInputs = [ autoreconfHook pkg-config fuse libuuid lz4 ];
configureFlags = [ "--enable-fuse" ];
pkgs/os-specific/linux/eudev/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, pkgconfig, glib, gperf, util-linux, kmod}:
{lib, stdenv, fetchurl, pkg-config, glib, gperf, util-linux, kmod}:
let
s = # Generated upstream information
rec {
@@ -9,7 +9,7 @@ let
sha256 = "1z6lfhhbjs6j7pbp6ybn17ywjsdl87ql6g1p3m2y26aa10cqcqc9";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
glib gperf util-linux kmod
];
pkgs/os-specific/linux/fbterm/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}:
{stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86}:
let
s = # Generated upstream information
{
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
inherit (s) url sha256;
};
nativeBuildInputs = [ pkgconfig ncurses ];
nativeBuildInputs = [ pkg-config ncurses ];
inherit buildInputs;
preConfigure = ''
pkgs/os-specific/linux/ffado/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
, libiec61883
, libraw1394
, libxmlxx3
, pkgconfig
, pkg-config
, python3
, sconsPackages
, which
@@ -46,7 +46,7 @@ mkDerivation rec {
nativeBuildInputs = [
desktop-file-utils
sconsPackages.scons_3_1_2
pkgconfig
pkg-config
which
python
pyqt5
pkgs/os-specific/linux/firmware/firmware-manager/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }:
{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }:
rustPlatform.buildRustPackage rec {
pname = "firmware-manager";
version = "0.1.1";
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0x9604jsflqxvbkfp139mzjicpyx8v21139jj8bp88c14ngvmdlw";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
buildInputs = [ lzma openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ];
pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig }:
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
let
inherit (lib) optionals;
pkgs/os-specific/linux/firmware/system76-firmware/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, efibootmgr, makeWrapper }:
{ rustPlatform, lib, fetchFromGitHub, lzma, pkg-config, openssl, dbus, efibootmgr, makeWrapper }:
rustPlatform.buildRustPackage rec {
pname = "system76-firmware";
# Check Makefile when updating, make sure postInstall matches make install
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0yjv3a8r01ks91gc33rdwqmw52cqqwhq9f3rvw2xv3h8cqa5hfz0";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ lzma openssl dbus ];
pkgs/os-specific/linux/fwts/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchzip, autoreconfHook, pkgconfig, glib, libtool, pcre
{ lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, libtool, pcre
, json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
stripRoot = false;
};
nativeBuildInputs = [ autoreconfHook pkgconfig libtool ];
nativeBuildInputs = [ autoreconfHook pkg-config libtool ];
buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl libbsd ];
postPatch = ''
pkgs/os-specific/linux/guvcview/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, lib, stdenv
, fetchurl
, intltool
, pkgconfig
, pkg-config
, portaudio
, SDL2
, ffmpeg
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
intltool
pkgconfig
pkg-config
]
++ lib.optionals (useGtk) [ wrapGAppsHook ]
++ lib.optionals (useQt) [ wrapQtAppsHook ]
pkgs/os-specific/linux/hal-flash/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkgconfig, udisks2 }:
{ lib, stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkg-config, udisks2 }:
stdenv.mkDerivation {
name = "hal-flash-0.3.3";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "0dw9bx190mrh0dycw4rfvfmwwvh2sgypffr99nfnr36b38jrd6y6";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ autoconf automake dbus glib libtool udisks2 ];
preConfigure = "libtoolize && aclocal && autoconf && automake --add-missing";
pkgs/os-specific/linux/hostapd/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:
{ lib, stdenv, fetchurl, pkg-config, libnl, openssl, sqlite ? null }:
stdenv.mkDerivation rec {
pname = "hostapd";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1mrbvg4v7vm7mknf0n29mf88k3s4a4qj6r4d51wq8hmjj1m7s7c8";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libnl openssl sqlite ];
patches = [
pkgs/os-specific/linux/iio-sensor-proxy/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake
, glib, gtk3, gtk-doc, libgudev, pkgconfig, systemd }:
, glib, gtk3, gtk-doc, libgudev, pkg-config, systemd }:
stdenv.mkDerivation rec {
pname = "iio-sensor-proxy";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
gettext
intltool
libtool
pkgconfig
pkg-config
];
meta = with lib; {
pkgs/os-specific/linux/ima-evm-utils/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }:
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, openssl, attr, keyutils, asciidoc, libxslt, docbook_xsl }:
stdenv.mkDerivation rec {
pname = "ima-evm-utils";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1dhfw6d9z4dv82q9zg2g025hgr179kamz9chy7v5w9b71aam8jf8";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ openssl attr keyutils asciidoc libxslt ];
patches = [ ./xattr.patch ];
pkgs/os-specific/linux/intel-compute-runtime/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, fetchFromGitHub
, patchelf
, cmake
, pkgconfig
, pkg-config
, intel-gmmlib
, intel-graphics-compiler
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
sha256 = "19scbbr6jf3yp2v7z8xyzzm01g44jym7xfkf1dz64d5nhvjw6ig5";
};
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ intel-gmmlib intel-graphics-compiler libva ];
pkgs/os-specific/linux/ipset/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, libmnl }:
{ lib, stdenv, fetchurl, pkg-config, libmnl }:
stdenv.mkDerivation rec {
pname = "ipset";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "02mkp7vmsh609dcp02xi290sxmsgq2fsch3875dxkwfxkrl16p5p";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libmnl ];
configureFlags = [ "--with-kmod=no" ];
pkgs/os-specific/linux/iptables/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, pruneLibtoolFiles, flex, bison
{ lib, stdenv, fetchurl, pkg-config, pruneLibtoolFiles, flex, bison
, libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap
, nftablesCompat ? false
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0rvp0k8a72h2snrdx48cfn75bfa0ycrd2xl3kjysbymq7q6gxx50";
};
nativeBuildInputs = [ pkgconfig pruneLibtoolFiles flex bison ];
nativeBuildInputs = [ pkg-config pruneLibtoolFiles flex bison ];
buildInputs = [ libmnl libnetfilter_conntrack libnfnetlink libnftnl libpcap ];
pkgs/os-specific/linux/iputils/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
, meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns
, meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns
, libcap, libidn2
}:
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
# Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111):
++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false";
nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns ];
nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ];
buildInputs = [ libcap ]
++ optional (!stdenv.hostPlatform.isMusl) libidn2;
pkgs/os-specific/linux/ipvsadm/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, libnl, popt, gnugrep }:
{ lib, stdenv, fetchurl, pkg-config, libnl, popt, gnugrep }:
stdenv.mkDerivation rec {
pname = "ipvsadm";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace "-lnl" "$(pkg-config --libs libnl-genl-3.0)"
'';
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libnl popt ];
preBuild = ''
pkgs/os-specific/linux/irqbalance/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, libcap_ng }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, ncurses, libcap_ng }:
stdenv.mkDerivation rec {
pname = "irqbalance";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1677ap6z4hvwga0vb8hrvpc0qggyarg9mlg11pxywz7mq94vdx19";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ glib ncurses libcap_ng ];
LDFLAGS = "-lncurses";
pkgs/os-specific/linux/iwd/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, fetchgit
, fetchpatch
, autoreconfHook
, pkgconfig
, pkg-config
, ell
, coreutils
, docutils
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
docutils
pkgconfig
pkg-config
python3Packages.wrapPython
];
pkgs/os-specific/linux/jool/cli.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libnl, iptables }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libnl, iptables }:
let
sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; };
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = sourceAttrs.src;
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libnl iptables ];
makeFlags = [ "-C" "src/usr" ];
pkgs/os-specific/linux/kbd/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, autoreconfHook,
gzip, bzip2, pkgconfig, flex, check,
gzip, bzip2, pkg-config, flex, check,
pam, coreutils
}:
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
buildInputs = [ check pam ];
nativeBuildInputs = [ autoreconfHook pkgconfig flex ];
nativeBuildInputs = [ autoreconfHook pkg-config flex ];
makeFlags = [ "setowner=" ];
pkgs/os-specific/linux/kernel/perf.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper
, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils
, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils
, libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl
, zlib, withGtk ? false, gtk2 ? null
}:
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
# perf refers both to newt and slang
nativeBuildInputs = [
asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
flex bison libiberty audit makeWrapper pkgconfig python3
flex bison libiberty audit makeWrapper pkg-config python3
];
buildInputs = [
elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl
pkgs/os-specific/linux/kmod/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig
{ stdenv, lib, fetchurl, autoreconfHook, pkg-config
, libxslt, xz, elf-header
, withStatic ? stdenv.hostPlatform.isStatic
}:
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
sha256 = "035wzfzjx4nwidk747p8n085mgkvy531ppn16krrajx2dkqzply1";
};
nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ];
nativeBuildInputs = [ autoreconfHook pkg-config libxslt ];
buildInputs = [ xz ] ++ lib.optional stdenv.isDarwin elf-header;
configureFlags = [
pkgs/os-specific/linux/kmscon/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
, libGLU, libGL
, pango
, pixman
, pkgconfig
, pkg-config
, docbook_xsl
, libxslt
}:
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
docbook_xsl
pkgconfig
pkg-config
];
configureFlags = [
pkgs/os-specific/linux/kmscube/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkgconfig }:
{ lib, stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkg-config }:
stdenv.mkDerivation {
name = "kmscube-2018-06-17";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1q5b5yvyfj3127385mp1bfmcbnpnbdswdk8gspp7g4541xk4k933";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libdrm libX11 libGL mesa ];
meta = with lib; {
pkgs/os-specific/linux/latencytop/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, ncurses, glib, pkgconfig, gtk2 }:
{ lib, stdenv, fetchurl, ncurses, glib, pkg-config, gtk2 }:
stdenv.mkDerivation rec {
name = "latencytop-0.5";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses glib gtk2 ];
meta = {
pkgs/os-specific/linux/libatasmart/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, udev, buildPackages }:
{ lib, stdenv, fetchurl, pkg-config, udev, buildPackages }:
stdenv.mkDerivation rec {
name = "libatasmart-0.19";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ udev ];
meta = with lib; {
pkgs/os-specific/linux/libbpf/default.nix
+3 -3
View File
@@ -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.
pkgs/os-specific/linux/libevdevc/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, coreutils, pkgconfig, glib, jsoncpp }:
{ lib, stdenv, fetchFromGitHub, coreutils, pkg-config, glib, jsoncpp }:
stdenv.mkDerivation rec {
name = "libevdevc";
pkgs/os-specific/linux/libfabric/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, libpsm2 }:
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, libpsm2 }:
stdenv.mkDerivation rec {
pname = "libfabric";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "17qq96mlfhbkbmsvbazhxzkjnh6x37xlh3r0ngp0rfqbl05z2pcr";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ] ;
nativeBuildInputs = [ pkg-config autoreconfHook ] ;
buildInputs = [ libpsm2 ] ;
pkgs/os-specific/linux/libgestures/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, jsoncpp }:
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, jsoncpp }:
stdenv.mkDerivation rec {
name = "libgestures-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
--replace '$(DESTDIR)/usr/include' '$(DESTDIR)/include'
'';
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib jsoncpp ];
pkgs/os-specific/linux/libnl/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig
{ stdenv, file, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkg-config
, pythonSupport ? false, swig ? null, python}:
stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ autoreconfHook bison flex pkgconfig file ]
nativeBuildInputs = [ autoreconfHook bison flex pkg-config file ]
++ lib.optional pythonSupport swig;
postBuild = lib.optionalString (pythonSupport) ''
pkgs/os-specific/linux/libpsm2/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, numactl, pkgconfig }:
{ lib, stdenv, fetchFromGitHub, numactl, pkg-config }:
stdenv.mkDerivation rec {
pname = "libpsm2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ numactl pkgconfig ];
buildInputs = [ numactl pkg-config ];
installFlags = [
"DESTDIR=$(out)"
pkgs/os-specific/linux/libratbag/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config
, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3
, json-glib, libunistring }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
meson ninja pkgconfig gitMinimal swig check valgrind
meson ninja pkg-config gitMinimal swig check valgrind
];
buildInputs = [
pkgs/os-specific/linux/libselinux/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pcre, pkgconfig, libsepol
{ lib, stdenv, fetchurl, pcre, pkg-config, libsepol
, enablePython ? true, swig ? null, python3 ? null
, fts
}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "0cr4p0qkr4qd5z1x677vwhz6mlz55kxyijwi2dmrvbhxcw7v78if";
};
nativeBuildInputs = [ pkgconfig ] ++ optionals enablePython [ swig python3 ];
nativeBuildInputs = [ pkg-config ] ++ optionals enablePython [ swig python3 ];
buildInputs = [ libsepol pcre fts ] ++ optionals enablePython [ python3 ];
# drop fortify here since package uses it by default, leading to compile error:
pkgs/os-specific/linux/libsemanage/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, bison, flex, libsepol, libselinux, bzip2, audit
{ lib, stdenv, fetchurl, pkg-config, bison, flex, libsepol, libselinux, bzip2, audit
, enablePython ? true, swig ? null, python ? null
}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" ] ++ optional enablePython "py";
nativeBuildInputs = [ bison flex pkgconfig ];
nativeBuildInputs = [ bison flex pkg-config ];
buildInputs = [ libsepol libselinux bzip2 audit ]
++ optionals enablePython [ swig python ];
pkgs/os-specific/linux/libsmbios/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, help2man, gettext
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, help2man, gettext
, libxml2, perl, python3, doxygen }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i";
};
nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkgconfig ];
nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkg-config ];
buildInputs = [ python3 ];
pkgs/os-specific/linux/lightum/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkgconfig, systemd }:
{ lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }:
stdenv.mkDerivation {
name = "lightum-2014-06-07";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
libX11
libXScrnSaver
libXext
pkgconfig
pkg-config
systemd
];
pkgs/os-specific/linux/lvm2/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, stdenv
, fetchpatch
, fetchurl
, pkgconfig
, pkg-config
, util-linux
, libuuid
, thin-provisioning-tools, libaio
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
sha256 = "1m4xpda8vbyd89ca0w8nacvnl4j34yzsa625gn990fb5sh84ab44";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ udev libuuid thin-provisioning-tools libaio ];
configureFlags = [
pkgs/os-specific/linux/lxc/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, perl, docbook2x
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, perl, docbook2x
, docbook_xml_dtd_45, python3Packages, pam
# Optional Dependencies
@@ -9,15 +9,15 @@
with lib;
stdenv.mkDerivation rec {
pname = "lxc";
version = "4.0.5";
version = "4.0.6";
src = fetchurl {
url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
sha256 = "1976l9308rx1ria1gazasypk5rmmf5jiqdh54dfrws5bslbdcb5g";
sha256 = "0qz4l7mlhq7hx53q606qgvkyzyr01glsw290v8ppzvxn1fydlrci";
};
nativeBuildInputs = [
autoreconfHook pkgconfig perl docbook2x python3Packages.wrapPython
autoreconfHook pkg-config perl docbook2x python3Packages.wrapPython
];
buildInputs = [
pam libapparmor gnutls libselinux libseccomp libcap
pkgs/os-specific/linux/lxcfs/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ config, lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse
{ config, lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, help2man, fuse
, util-linux, makeWrapper
, enableDebugBuild ? config.lxcfs.enableDebugBuild or false }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "1fp2q4y3ql4xd2lp4bpcl8s6xryr5xbb56da9d20w2cdr2d0lwyv";
};
nativeBuildInputs = [ pkgconfig help2man autoreconfHook ];
nativeBuildInputs = [ pkg-config help2man autoreconfHook ];
buildInputs = [ fuse makeWrapper ];
preConfigure = lib.optionalString enableDebugBuild ''
pkgs/os-specific/linux/miraclecast/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config
, glib, readline, pcre, systemd, udev }:
stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "05afqi33rv7k6pbkkw4mynj6p97vkzhhh13y5nh0yxkyhcgf45pm";
};
nativeBuildInputs = [ meson ninja pkgconfig ];
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ glib pcre readline systemd udev ];
pkgs/os-specific/linux/multipath-tools/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }:
{ lib, stdenv, fetchurl, pkg-config, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }:
stdenv.mkDerivation rec {
pname = "multipath-tools";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
$(find * -name Makefile\*)
'';
nativeBuildInputs = [ gzip pkgconfig perl ];
nativeBuildInputs = [ gzip pkg-config perl ];
buildInputs = [ systemd lvm2 libaio readline liburcu json_c ];
makeFlags = [
pkgs/os-specific/linux/nfs-utils/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, lib, pkgconfig, util-linux, libcap, libtirpc, libevent
{ stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent
, sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers
, python3, buildPackages, nixosTests, rpcsvc-proto
, enablePython ? true
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
# put it in the "lib" output, and the headers in "dev"
outputs = [ "out" "dev" "lib" "man" ];
nativeBuildInputs = [ pkgconfig buildPackages.stdenv.cc rpcsvc-proto ];
nativeBuildInputs = [ pkg-config buildPackages.stdenv.cc rpcsvc-proto ];
buildInputs = [
libtirpc libcap libevent sqlite lvm2
pkgs/os-specific/linux/nftables/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, bison, file, flex
{ lib, stdenv, fetchurl, pkg-config, bison, file, flex
, asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl
, libmnl, libnftnl, libpcap
, gmp, jansson, readline
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
pkgconfig bison file flex
pkg-config bison file flex
asciidoc docbook_xml_dtd_45 docbook_xsl findXMLCatalogs libxslt
];
pkgs/os-specific/linux/numatop/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, numactl, ncurses, check }:
{ lib, stdenv, fetchurl, pkg-config, numactl, ncurses, check }:
stdenv.mkDerivation rec {
pname = "numatop";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1s7psq1xyswj0lpx10zg5lnppav2xy9safkfx3rssrs9c2fp5d76";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ numactl ncurses ];
checkInputs = [ check ];
pkgs/os-specific/linux/nvidia-x11/settings.nix
+2 -2
View File
@@ -1,6 +1,6 @@
nvidia_x11: sha256:
{ stdenv, lib, fetchFromGitHub, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau
{ stdenv, lib, fetchFromGitHub, pkg-config, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau
, librsvg, wrapGAppsHook
, withGtk2 ? false, withGtk3 ? true
}:
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
version = nvidia_x11.settingsVersion;
inherit src;
nativeBuildInputs = [ pkgconfig m4 ];
nativeBuildInputs = [ pkg-config m4 ];
buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ]
++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ];
pkgs/os-specific/linux/odp-dpdk/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config
, dpdk, libconfig, libpcap, numactl, openssl, zlib, libbsd, libelf, jansson
}: let
dpdk_18_11 = dpdk.overrideAttrs (old: rec {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
pkgconfig
pkg-config
];
buildInputs = [
dpdk_18_11
pkgs/os-specific/linux/ofp/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
, openssl, libpcap, odp-dpdk, dpdk
}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "05902593fycgkwzk5g7wzgk0k40nrrgybplkdka3rqnlj6aydhqf";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ openssl libpcap odp-dpdk dpdk ];
dontDisableStatic = true;
pkgs/os-specific/linux/openvswitch/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which
, procps, libcap_ng, openssl, python3 , perl
, kernel ? null }:
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
kernel = optional (_kernel != null) _kernel.dev;
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ makeWrapper util-linux openssl libcap_ng pythonEnv
perl procps which ];
pkgs/os-specific/linux/openvswitch/lts.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, util-linux, which
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, util-linux, which
, procps, libcap_ng, openssl, python2, iproute , perl
, automake, autoconf, libtool, kernel ? null }:
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
kernel = optional (_kernel != null) _kernel.dev;
nativeBuildInputs = [ autoconf libtool automake pkgconfig ];
nativeBuildInputs = [ autoconf libtool automake pkg-config ];
buildInputs = [ makeWrapper util-linux openssl libcap_ng python2
perl procps which ];
pkgs/os-specific/linux/pam_mount/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, util-linux }:
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, util-linux }:
stdenv.mkDerivation rec {
pname = "pam_mount";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
--replace @@NIX_UTILLINUX@@ ${util-linux}/bin
'';
nativeBuildInputs = [ autoreconfHook libtool pkgconfig ];
nativeBuildInputs = [ autoreconfHook libtool pkg-config ];
buildInputs = [ pam libHX util-linux libxml2 pcre perl openssl cryptsetup ];
pkgs/os-specific/linux/pam_pgsql/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, postgresql, libgcrypt, pam }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, postgresql, libgcrypt, pam }:
stdenv.mkDerivation rec {
pname = "pam_pgsql";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1a68krq5m07zspdxwl1wmkr5j98zr9bdg4776kvplrsdcg97h4jk";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libgcrypt pam postgresql ];
meta = with lib; {
pkgs/os-specific/linux/pam_u2f/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, libfido2, pam, openssl }:
{ lib, stdenv, fetchurl, pkg-config, libfido2, pam, openssl }:
stdenv.mkDerivation rec {
pname = "pam_u2f";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "01fwbrfnjkv93vvqm54jywdcxa1p7d4r32azicwnx75nxfbbzhqd";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libfido2 pam openssl ];
preConfigure = ''
pkgs/os-specific/linux/pam_usb/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript, runtimeShell }:
{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkg-config, pmount, pythonPackages, writeScript, runtimeShell }:
let
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [
makeWrapper
# pam_usb dependencies
dbus libxml2 pam pmount pkgconfig
dbus libxml2 pam pmount pkg-config
# pam_usb's tools dependencies
python
# cElementTree is included with python 2.5 and later.
pkgs/os-specific/linux/piper/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, meson, ninja, pkgconfig, gettext, fetchFromGitHub, python3
{ lib, stdenv, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3
, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3
, gobject-introspection }:
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "1nfjnsiwg2rs6gkjsxzhr2708i6di149dgwq3cf6l12rxqpb8arj";
};
nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
buildInputs = [
gtk3 glib gnome3.adwaita-icon-theme python3
];
pkgs/os-specific/linux/pktgen/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, meson, ninja, pkgconfig
{ stdenv, lib, fetchurl, meson, ninja, pkg-config
, dpdk, libbsd, libpcap, lua5_3, numactl, util-linux
, gtk2, which, withGtk ? false
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1clfviz1qa4hysslcg6i29vsxwl9f6j1y7zf9wwx9br3yq08x956";
};
nativeBuildInputs = [ meson ninja pkgconfig ];
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs =
[ dpdk libbsd libpcap lua5_3 numactl which ]
pkgs/os-specific/linux/plymouth/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxslt, docbook_xsl
{ stdenv, fetchurl, autoreconfHook, pkg-config, libxslt, docbook_xsl
, gtk3, udev, systemd, lib
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
autoreconfHook pkgconfig libxslt docbook_xsl
autoreconfHook pkg-config libxslt docbook_xsl
];
buildInputs = [
pkgs/os-specific/linux/pommed-light/default.nix
+2 -2
View File
@@ -4,7 +4,7 @@
, libconfuse
, alsaLib
, audiofile
, pkgconfig
, pkg-config
, zlib
, eject
}:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
substituteInPlace pommed/cd_eject.c --replace /usr/bin/eject ${eject}/bin/eject
'';
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
pciutils
libconfuse
pkgs/os-specific/linux/powertop/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }:
{ lib, stdenv, fetchurl, fetchpatch, gettext, libnl, ncurses, pciutils, pkg-config, zlib }:
stdenv.mkDerivation rec {
pname = "powertop";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gettext libnl ncurses pciutils zlib ];
patches = lib.optional stdenv.hostPlatform.isMusl (
pkgs/os-specific/linux/procps-ng/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, ncurses, pkgconfig
{ lib, stdenv, fetchurl, fetchpatch, ncurses, pkg-config
# `ps` with systemd support is able to properly report different
# attributes like unit name, so we want to have it on linux.
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses ]
++ lib.optional withSystemd systemd;
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
makeFlags = [ "usrbin_execdir=$(out)/bin" ]
++ lib.optionals watchOnly [ "watch" "PKG_LDFLAGS="];
pkgs/os-specific/linux/pscircle/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitLab, meson, pkgconfig, ninja, cairo }:
{ lib, stdenv, fetchFromGitLab, meson, pkg-config, ninja, cairo }:
stdenv.mkDerivation rec {
pname = "pscircle";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [
meson
pkgconfig
pkg-config
cairo
ninja
];
pkgs/os-specific/linux/radeontools/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl
, autoreconfHook
, pciutils
, pkgconfig
, pkg-config
, xorg
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0mjk9wr9rsb17yy92j6yi16hfpa6v5r1dbyiy60zp4r125wr63za";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ xorg.libpciaccess ];
meta = with lib; {
pkgs/os-specific/linux/radeontop/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgconfig, gettext, makeWrapper
{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, makeWrapper
, ncurses, libdrm, libpciaccess, libxcb }:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ ncurses libdrm libpciaccess libxcb ];
nativeBuildInputs = [ pkgconfig gettext makeWrapper ];
nativeBuildInputs = [ pkg-config gettext makeWrapper ];
enableParallelBuilding = true;
pkgs/os-specific/linux/rdma-core/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, docutils
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils
, pandoc, ethtool, iproute, libnl, udev, python, perl
, makeWrapper
} :
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
sha256 = "04q4z95nxxxjc674qnbwn19bv18nl3x7xwp6aql17h1cw3gdmhw4";
};
nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ];
nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ];
buildInputs = [ libnl ethtool iproute udev python perl ];
cmakeFlags = [
pkgs/os-specific/linux/rewritefs/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }:
{ lib, stdenv, fetchFromGitHub, pkg-config, fuse, pcre }:
stdenv.mkDerivation {
pname = "rewritefs";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "15bcxprkxf0xqxljsqhb0jpi7p1vwqcb00sjs7nzrj7vh2p7mqla";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ fuse pcre ];
prePatch = ''
pkgs/os-specific/linux/roccat-tools/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cmake, pkgconfig, gettext
{ lib, stdenv, fetchurl, cmake, pkg-config, gettext
, dbus, dbus-glib, libgaminggear, libgudev, lua
, harfbuzz
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
}' libroccat/roccat_helper.c
'';
nativeBuildInputs = [ cmake pkgconfig gettext ];
nativeBuildInputs = [ cmake pkg-config gettext ];
buildInputs = [ dbus dbus-glib libgaminggear libgudev lua ];
cmakeFlags = [
pkgs/os-specific/linux/rtkit/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
, meson, ninja, pkgconfig, unixtools
, meson, ninja, pkg-config, unixtools
, dbus, libcap, polkit, systemd
}:
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ meson ninja pkgconfig unixtools.xxd ];
nativeBuildInputs = [ meson ninja pkg-config unixtools.xxd ];
buildInputs = [ dbus libcap polkit systemd ];
mesonFlags = [
pkgs/os-specific/linux/sssd/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchpatch, glibc, augeas, dnsutils, c-ares, curl,
cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen,
python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap,
python, python3, pam, popt, talloc, tdb, tevent, pkg-config, ldb, openldap,
pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
libuuid, ldap, systemd, nspr, check, cmocka, uid_wrapper,
nss_wrapper, ncurses, Po4a, http-parser, jansson,
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ augeas dnsutils c-ares curl cyrus_sasl ding-libs libnl libunistring nss
samba nfs-utils doxygen python python3 popt
talloc tdb tevent pkgconfig ldb pam openldap pcre kerberos
talloc tdb tevent pkg-config ldb pam openldap pcre kerberos
cifs-utils glib keyutils dbus fakeroot libxslt libxml2
libuuid ldap systemd nspr check cmocka uid_wrapper
nss_wrapper ncurses Po4a http-parser jansson ];
pkgs/os-specific/linux/systemd/default.nix
+2 -2
View File
@@ -6,7 +6,7 @@
, ninja
, meson
, m4
, pkgconfig
, pkg-config
, coreutils
, gperf
, getent
@@ -250,7 +250,7 @@ stdenv.mkDerivation {
nativeBuildInputs =
[
pkgconfig
pkg-config
gperf
ninja
meson
pkgs/os-specific/linux/thunderbolt/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, boost
, cmake
, fetchFromGitHub
, pkgconfig
, pkg-config
, txt2tags
}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "02w1bfm7xvq0dzkhwqiq0camkzz9kvciyhnsis61c8vzp39cwx0x";
};
nativeBuildInputs = [ cmake pkgconfig txt2tags ];
nativeBuildInputs = [ cmake pkg-config txt2tags ];
buildInputs = [ boost ];
cmakeFlags = [
pkgs/os-specific/linux/udisks-glue/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }:
{ lib, stdenv, fetchurl, pkg-config, automake, autoconf, udisks1, dbus-glib, glib, libconfuse }:
stdenv.mkDerivation {
name = "udisks-glue-1.3.5";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "317d25bf249278dc8f6a5dcf18f760512427c772b9afe3cfe34e6e1baa258176";
};
nativeBuildInputs = [ pkgconfig automake autoconf ];
nativeBuildInputs = [ pkg-config automake autoconf ];
buildInputs = [ udisks1 dbus-glib glib libconfuse ];
preConfigure = "sh autogen.sh";
pkgs/os-specific/linux/udisks/1-default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, sg3_utils, udev, glib, dbus, dbus-glib
{ lib, stdenv, fetchurl, pkg-config, sg3_utils, udev, glib, dbus, dbus-glib
, polkit, parted, lvm2, libatasmart, intltool, libuuid, mdadm
, libxslt, docbook_xsl, util-linux, libgudev }:
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
lvm2 libatasmart intltool libuuid libxslt docbook_xsl
];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
configureFlags = [ "--localstatedir=/var" "--enable-lvm2" ];
pkgs/os-specific/linux/udisks/2-default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, libtool, pkgconfig, gettext, gnused
{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, libtool, pkg-config, gettext, gnused
, gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash, which
, expat, libxslt, docbook_xsl, util-linux, mdadm, libgudev, libblockdev, parted
, gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43, autoconf, automake
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [
autoconf automake pkgconfig libtool gettext which gobject-introspection
autoconf automake pkg-config libtool gettext which gobject-introspection
gtk-doc libxslt docbook_xml_dtd_412 docbook_xml_dtd_43 docbook_xsl
];
pkgs/os-specific/linux/unstick/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, meson, ninja, pkgconfig, libseccomp }:
{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, libseccomp }:
stdenv.mkDerivation rec {
name = "unstick";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sourceRoot = "source/src";
nativeBuildInputs = [ meson ninja pkgconfig ];
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ libseccomp ];
meta = {
pkgs/os-specific/linux/upower/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchurl
, pkgconfig
, pkg-config
, libxslt
, docbook_xsl
, udev
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
gettext
gobject-introspection
libxslt
pkgconfig
pkg-config
];
buildInputs = [
pkgs/os-specific/linux/usbguard/default.nix
+2 -2
View File
@@ -3,7 +3,7 @@
, fetchFromGitHub
, autoreconfHook
, asciidoc
, pkgconfig
, pkg-config
, libxslt
, libxml2
, docbook_xml_dtd_45
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
asciidoc
pkgconfig
pkg-config
libxslt # xsltproc
libxml2 # xmllint
docbook_xml_dtd_45
pkgs/os-specific/linux/usbutils/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkgconfig, libusb1, hwdata , python3 }:
{ lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkg-config, libusb1, hwdata , python3 }:
stdenv.mkDerivation rec {
name = "usbutils-012";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libusb1 python3 ];
outputs = [ "out" "man" "python" ];

Some files were not shown because too many files have changed in this diff Show More