From cbfdd2c54b783a4c842c15b8705fcbff69b0d6f8 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 5 Dec 2023 22:59:10 +0100 Subject: [PATCH] fix: do not use obsoleted pkgconfig alias, use pkg-config directly the pkgconfig alias has been dropped from nixpkgs in https://github.com/NixOS/nixpkgs/pull/254418 --- overrides/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/overrides/default.nix b/overrides/default.nix index de9680e..48b0564 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -937,7 +937,7 @@ lib.composeManyExtensions [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkg-config ]; buildInputs = (old.buildInputs or [ ]) - ++ [ pkgs.hdf5 self.pkgconfig ] + ++ [ pkgs.hdf5 self.pkg-config ] ++ lib.optional mpiSupport mpi ; propagatedBuildInputs = @@ -1179,7 +1179,7 @@ lib.composeManyExtensions [ else super.jsondiff; jsonslicer = super.jsonslicer.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.yajl ]; }); @@ -3065,7 +3065,7 @@ lib.composeManyExtensions [ ); secp256k1 = super.secp256k1.overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig pkgs.autoconf pkgs.automake pkgs.libtool ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config pkgs.autoconf pkgs.automake pkgs.libtool ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; doCheck = false; # Local setuptools versions like "x.y.post0" confuse an internal check