rarias/bscpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename pkgconfig to pkg-config

Browse Source 
The alias pkgconfig has been removed.

Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es>
This commit is contained in:
Rodrigo Arias 2023-11-20 16:57:54 +01:00
parent cbf6f03a84
commit e6b4af4b16
13 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/babeltrace/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkgconfig, glib, libuuid, popt, elfutils, swig4, python3 }: { stdenv, lib, fetchurl, pkg-config, glib, libuuid, popt, elfutils, swig4, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "babeltrace-1.5.8"; name = "babeltrace-1.5.8";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz"; sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib libuuid popt elfutils swig4 python3 ]; buildInputs = [ glib libuuid popt elfutils swig4 python3 ];
meta = with lib; { meta = with lib; {

4
pkgs/babeltrace2/default.nix
View File

@ -1,7 +1,7 @@
{ {
stdenv stdenv
, fetchurl , fetchurl
, pkgconfig , pkg-config
, glib , glib
, libuuid , libuuid
, popt , popt
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib libuuid popt elfutils python3 swig4 ncurses breakpointHook ]; buildInputs = [ glib libuuid popt elfutils python3 swig4 ncurses breakpointHook ];
hardeningDisable = [ "all" ]; hardeningDisable = [ "all" ];

4
pkgs/groff/default.nix
View File

@ -3,7 +3,7 @@
, psutils, netpbm #for html output , psutils, netpbm #for html output
, buildPackages , buildPackages
, autoreconfHook , autoreconfHook
, pkgconfig , pkg-config
, texinfo , texinfo
}: }:
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ ghostscript psutils netpbm perl ]; buildInputs = [ ghostscript psutils netpbm perl ];
nativeBuildInputs = [ autoreconfHook pkgconfig texinfo ]; nativeBuildInputs = [ autoreconfHook pkg-config texinfo ];
# Builds running without a chroot environment may detect the presence # Builds running without a chroot environment may detect the presence
# of /usr/X11 in the host system, leading to an impure build of the # of /usr/X11 in the host system, leading to an impure build of the

4
pkgs/hwloc/1.11.6/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkgconfig, expat, ncurses { stdenv, lib, fetchurl, pkg-config, expat, ncurses
, pciutils, numactl }: , pciutils, numactl }:
with lib; with lib;
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1yl7dm2qplwmnidd712zy12qfvxk28k8ccs694n42ybwdjwzg1bn"; sha256 = "1yl7dm2qplwmnidd712zy12qfvxk28k8ccs694n42ybwdjwzg1bn";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkg-config ];
# Filter out `null' inputs. This allows users to `.override' the # Filter out `null' inputs. This allows users to `.override' the
# derivation and set optional dependencies to `null'. # derivation and set optional dependencies to `null'.

4
pkgs/libpsm2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, numactl, pkgconfig }: { stdenv, lib, fetchFromGitHub, numactl, pkg-config }:
let let
version = "11.2.185"; version = "11.2.185";
@ -14,7 +14,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ numactl pkgconfig ]; buildInputs = [ numactl pkg-config ];
installFlags = [ installFlags = [
"DESTDIR=$(out)" "DESTDIR=$(out)"

6
pkgs/nix/default.nix
View File

@ -11,7 +11,7 @@ let
common = common =
{ lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz { lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz
, bash, coreutils, gzip, gnutar , bash, coreutils, gzip, gnutar
, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns
, jq, libarchive, rustc, cargo , jq, libarchive, rustc, cargo
# Used by tests # Used by tests
@ -40,7 +40,7 @@ common =
outputs = [ "out" "dev" "man" "doc" ]; outputs = [ "out" "dev" "man" "doc" ];
nativeBuildInputs = nativeBuildInputs =
[ pkgconfig ] [ pkg-config ]
++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt
docbook5 docbook_xsl_ns jq gmock ]; docbook5 docbook_xsl_ns jq gmock ];
@ -158,7 +158,7 @@ common =
# This is not cross-compile safe, don't have time to fix right now # This is not cross-compile safe, don't have time to fix right now
# but noting for future travellers. # but noting for future travellers.
nativeBuildInputs = nativeBuildInputs =
[ perl pkgconfig curl nix libsodium boost autoreconfHook autoconf-archive ]; [ perl pkg-config curl nix libsodium boost autoreconfHook autoconf-archive ];
configureFlags = configureFlags =
[ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"

6
pkgs/nix/static.nix
View File

@ -14,7 +14,7 @@ enableStatic = true;
common = common =
{ lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz { lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz
, bash, coreutils, gzip, gnutar , bash, coreutils, gzip, gnutar
, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns
, jq, libarchive , jq, libarchive
# Used by tests # Used by tests
@ -41,7 +41,7 @@ common =
outputs = [ "out" "dev" "man" "doc" ]; outputs = [ "out" "dev" "man" "doc" ];
nativeBuildInputs = nativeBuildInputs =
[ pkgconfig ] [ pkg-config ]
++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt
docbook5 docbook_xsl_ns jq ]; docbook5 docbook_xsl_ns jq ];
@ -164,7 +164,7 @@ common =
# This is not cross-compile safe, don't have time to fix right now # This is not cross-compile safe, don't have time to fix right now
# but noting for future travellers. # but noting for future travellers.
nativeBuildInputs = nativeBuildInputs =
[ perl pkgconfig curl nix libsodium boost autoreconfHook autoconf-archive ]; [ perl pkg-config curl nix libsodium boost autoreconfHook autoconf-archive ];
configureFlags = configureFlags =
[ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"

4
pkgs/nosv/default.nix
View File

@ -3,7 +3,7 @@
, lib , lib
, autoreconfHook , autoreconfHook
, fetchFromGitHub , fetchFromGitHub
, pkgconfig , pkg-config
, numactl , numactl
, hwloc , hwloc
, ovni ? null , ovni ? null
@ -46,7 +46,7 @@ in
configureFlags = [ "--with-ovni=${ovni}" ]; configureFlags = [ "--with-ovni=${ovni}" ];
buildInputs = [ buildInputs = [
autoreconfHook autoreconfHook
pkgconfig pkg-config
numactl numactl
hwloc hwloc
ovni ovni

4
pkgs/perf/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper { 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 , libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl
, zlib, withGtk ? false, gtk2 ? null , zlib, withGtk ? false, gtk2 ? null
, babeltrace , babeltrace
@ -42,7 +42,7 @@ stdenv.mkDerivation {
# perf refers both to newt and slang # perf refers both to newt and slang
nativeBuildInputs = [ nativeBuildInputs = [
asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt 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 = [ buildInputs = [
elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl

4
pkgs/rdma-core/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, docutils { stdenv, lib, fetchFromGitHub, cmake, pkg-config, docutils
, pandoc, ethtool, iproute, libnl, udev, python, perl , pandoc, ethtool, iproute, libnl, udev, python, perl
, makeWrapper , makeWrapper
} : } :
@ -17,7 +17,7 @@ in stdenv.mkDerivation {
sha256 = "1xkmdix6mgv6kjjj6wi844bfddhl0ybalrp5g8pf5izasc43brg7"; sha256 = "1xkmdix6mgv6kjjj6wi844bfddhl0ybalrp5g8pf5izasc43brg7";
}; };
nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ];
buildInputs = [ libnl ethtool iproute udev python perl ]; buildInputs = [ libnl ethtool iproute udev python perl ];
cmakeFlags = [ cmakeFlags = [

4
pkgs/slurm/16.05.8.1/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, libtool, curl { stdenv, lib, fetchFromGitHub, pkg-config, libtool, curl
, python3, munge, perl, pam, zlib, shadow, coreutils , python3, munge, perl, pam, zlib, shadow, coreutils
, ncurses, libmysqlclient, lua, hwloc, numactl , ncurses, libmysqlclient, lua, hwloc, numactl
, readline, freeipmi, xorg, lz4, rdma-core, nixosTests , readline, freeipmi, xorg, lz4, rdma-core, nixosTests
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
# this doesn't fix tests completely at least makes slurmd to launch # this doesn't fix tests completely at least makes slurmd to launch
hardeningDisable = [ "fortify" "bindnow" ]; hardeningDisable = [ "fortify" "bindnow" ];
nativeBuildInputs = [ pkgconfig libtool python3 ]; nativeBuildInputs = [ pkg-config libtool python3 ];
buildInputs = [ buildInputs = [
curl python3 munge perl pam zlib curl python3 munge perl pam zlib
libmysqlclient ncurses lz4 rdma-core libmysqlclient ncurses lz4 rdma-core

4
pkgs/slurm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, libtool, curl { stdenv, lib, fetchFromGitHub, pkg-config, libtool, curl
, python, munge, perl, pam, openssl , python, munge, perl, pam, openssl
, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
, readline, freeipmi, libssh2, xorg , readline, freeipmi, libssh2, xorg
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
# this doesn't fix tests completely at least makes slurmd to launch # this doesn't fix tests completely at least makes slurmd to launch
hardeningDisable = [ "bindnow" ]; hardeningDisable = [ "bindnow" ];
nativeBuildInputs = [ pkgconfig libtool ]; nativeBuildInputs = [ pkg-config libtool ];
buildInputs = [ buildInputs = [
curl python munge perl pam openssl curl python munge perl pam openssl
libmysqlclient ncurses gtk2 libmysqlclient ncurses gtk2

4
pkgs/slurm/pmi2.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, libtool, curl { stdenv, lib, fetchFromGitHub, pkg-config, libtool, curl
, python3, munge, perl, pam, openssl , python3, munge, perl, pam, openssl
, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
, readline, freeipmi, libssh2, xorg , readline, freeipmi, libssh2, xorg
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
# this doesn't fix tests completely at least makes slurmd to launch # this doesn't fix tests completely at least makes slurmd to launch
hardeningDisable = [ "bindnow" ]; hardeningDisable = [ "bindnow" ];
nativeBuildInputs = [ pkgconfig libtool ]; nativeBuildInputs = [ pkg-config libtool ];
buildInputs = [ buildInputs = [
curl python3 munge perl pam openssl curl python3 munge perl pam openssl
libmysqlclient ncurses gtk2 libmysqlclient ncurses gtk2