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

treewide: pkgconfig -> pkg-config

Browse Source 
Fix building with `config.allowAliases = false;`.
This commit is contained in:
Samuel Gräfenstein 2021-03-16 22:44:57 +01:00
parent 9ce80206a1
commit 819ab46fe7
No known key found for this signature in database
GPG Key ID: EF76A063F15C63C8
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/cluster/nixops/shell.nix
View File

@ -3,7 +3,7 @@
pkgs.mkShell { pkgs.mkShell {
buildInputs = [ buildInputs = [
pkgs.poetry2nix.cli pkgs.poetry2nix.cli
pkgs.pkgconfig pkgs.pkg-config
pkgs.libvirt pkgs.libvirt
pkgs.poetry pkgs.poetry
]; ];

2
pkgs/development/python-modules/pycdio/default.nix
View File

@ -26,7 +26,7 @@ buildPythonPackage rec {
patchShebangs . patchShebangs .
''; '';
nativeBuildInputs = [ nose pkgs.pkgconfig pkgs.swig ]; nativeBuildInputs = [ nose pkgs.pkg-config pkgs.swig ];
buildInputs = [ setuptools pkgs.libcdio ] buildInputs = [ setuptools pkgs.libcdio ]
++ lib.optional stdenv.isDarwin pkgs.libiconv; ++ lib.optional stdenv.isDarwin pkgs.libiconv;

2
pkgs/development/python-modules/pyparted/default.nix
View File

@ -38,7 +38,7 @@ buildPythonPackage rec {
PATH="${pkgs.parted}/sbin:$PATH" PATH="${pkgs.parted}/sbin:$PATH"
''; '';
nativeBuildInputs = [ pkgs.pkgconfig ]; nativeBuildInputs = [ pkgs.pkg-config ];
checkInputs = [ six ]; checkInputs = [ six ];
propagatedBuildInputs = [ pkgs.parted ]; propagatedBuildInputs = [ pkgs.parted ];

2
pkgs/development/python-modules/pypoppler/default.nix
View File

@ -17,7 +17,7 @@ buildPythonPackage rec {
}; };
NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/"; NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/";
nativeBuildInputs = [ pkgs.pkgconfig ]; nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ pkgs.poppler.dev ]; buildInputs = [ pkgs.poppler.dev ];
propagatedBuildInputs = [ pycairo pygobject2 ]; propagatedBuildInputs = [ pycairo pygobject2 ];

2
pkgs/development/r-modules/default.nix
View File

@ -231,7 +231,7 @@ let
}; };
packagesWithNativeBuildInputs = { packagesWithNativeBuildInputs = {
arrow = [ pkgs.pkgconfig pkgs.arrow-cpp ]; arrow = [ pkgs.pkg-config pkgs.arrow-cpp ];
adimpro = [ pkgs.imagemagick ]; adimpro = [ pkgs.imagemagick ];
animation = [ pkgs.which ]; animation = [ pkgs.which ];
audio = [ pkgs.portaudio ]; audio = [ pkgs.portaudio ];

4
pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
View File

@ -313,7 +313,7 @@ self: super:
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
buildInputs = buildInputs =
(old.buildInputs or [ ]) (old.buildInputs or [ ])
++ [ pkgs.hdf5 self.pkgconfig self.cython ] ++ [ pkgs.hdf5 self.pkg-config self.cython ]
++ lib.optional mpiSupport mpi ++ lib.optional mpiSupport mpi
; ;
propagatedBuildInputs = propagatedBuildInputs =
@ -453,7 +453,7 @@ self: super:
); );
jsonslicer = super.jsonslicer.overridePythonAttrs (old: { jsonslicer = super.jsonslicer.overridePythonAttrs (old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.yajl ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.yajl ];
}); });