overrides: pkgconfig -> pkg-config

This commit is contained in:
adisbladis 2021-02-02 15:06:02 +01:00
parent 11ad022705
commit 095793f14f
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7

View file

@ -56,7 +56,7 @@ self: super:
av = super.av.overridePythonAttrs ( av = super.av.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.pkgconfig pkgs.pkg-config
]; ];
buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ];
} }
@ -246,7 +246,7 @@ self: super:
h5py = super.h5py.overridePythonAttrs ( h5py = super.h5py.overridePythonAttrs (
old: old:
if old.format != "wheel" then rec { if old.format != "wheel" then rec {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ];
configure_flags = "--hdf5=${pkgs.hdf5}"; configure_flags = "--hdf5=${pkgs.hdf5}";
postConfigure = '' postConfigure = ''
@ -398,7 +398,7 @@ self: super:
); );
libvirt-python = super.libvirt-python.overridePythonAttrs ({ nativeBuildInputs ? [ ], ... }: { libvirt-python = super.libvirt-python.overridePythonAttrs ({ nativeBuildInputs ? [ ], ... }: {
nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkgconfig ]; nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkg-config ];
propagatedBuildInputs = [ pkgs.libvirt ]; propagatedBuildInputs = [ pkgs.libvirt ];
}); });
@ -433,7 +433,7 @@ self: super:
lxml = super.lxml.overridePythonAttrs ( lxml = super.lxml.overridePythonAttrs (
old: { old: {
nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkg-config libxml2.dev libxslt.dev ];
buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ];
} }
); );
@ -464,7 +464,7 @@ self: super:
++ lib.optional stdenv.isDarwin [ Cocoa ]; ++ lib.optional stdenv.isDarwin [ Cocoa ];
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.pkgconfig pkgs.pkg-config
]; ];
postPatch = '' postPatch = ''
@ -662,7 +662,7 @@ self: super:
pillow = super.pillow.overridePythonAttrs ( pillow = super.pillow.overridePythonAttrs (
old: { old: {
nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; nativeBuildInputs = [ pkgs.pkg-config ] ++ old.nativeBuildInputs;
buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs;
} }
); );
@ -753,7 +753,7 @@ self: super:
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = old.nativeBuildInputs ++ [
self.cython self.cython
pkgs.pkgconfig pkgs.pkg-config
pkgs.cmake pkgs.cmake
]; ];
@ -802,7 +802,7 @@ self: super:
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.meson pkgs.meson
pkgs.ninja pkgs.ninja
pkgs.pkgconfig pkgs.pkg-config
]; ];
propagatedBuildInputs = old.propagatedBuildInputs ++ [ propagatedBuildInputs = old.propagatedBuildInputs ++ [
@ -869,7 +869,7 @@ self: super:
pygobject = super.pygobject.overridePythonAttrs ( pygobject = super.pygobject.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ];
} }
); );
@ -920,7 +920,7 @@ self: super:
format = "other"; format = "other";
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.pkgconfig pkgs.pkg-config
pkgs.qt5.qmake pkgs.qt5.qmake
pkgs.xorg.lndir pkgs.xorg.lndir
pkgs.qt5.qtbase pkgs.qt5.qtbase
@ -1085,7 +1085,7 @@ self: super:
pyzmq = super.pyzmq.overridePythonAttrs ( pyzmq = super.pyzmq.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ];
} }
); );
@ -1190,7 +1190,7 @@ self: super:
tables = super.tables.overridePythonAttrs ( tables = super.tables.overridePythonAttrs (
old: { old: {
HDF5_DIR = "${pkgs.hdf5}"; HDF5_DIR = "${pkgs.hdf5}";
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ];
} }
); );