Merge pull request #116564 from samuelgrf/fix-allowAliases-false

This commit is contained in:
Sandro
2021-03-17 09:40:53 +01:00
committed by GitHub
47 changed files with 94 additions and 92 deletions

View File

@@ -27,7 +27,7 @@ stdenv.mkDerivation {
configure
'';
nativeBuildInputs = [ pkgs.pkgconfig ];
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ python pygobject2 pygtk pkgs.libnotify pkgs.glib pkgs.gtk2 pkgs.dbus-glib ];
postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";

View File

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

View File

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

View File

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

View File

@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, saneBackends
, sane-backends
}:
buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
};
buildInputs = [
saneBackends
sane-backends
];
meta = with lib; {