Merge pull request #1206 from jaybutera/patch-1

patch missing old buildinputs
This commit is contained in:
adisbladis 2023-07-07 12:20:15 +00:00 committed by GitHub
commit c29afc154b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2473,7 +2473,7 @@ lib.composeManyExtensions [
in
selenium.overridePythonAttrs (old: {
# Selenium <4 can be installed from sources, with setuptools
buildInputs = old.buildInputs ++ (lib.optionals (!v4orLater) [ self.setuptools ]);
buildInputs = (old.buildInputs or [ ]) ++ (lib.optionals (!v4orLater) [ self.setuptools ]);
});
shapely = super.shapely.overridePythonAttrs (
@ -2523,7 +2523,7 @@ lib.composeManyExtensions [
});
systemd-python = super.systemd-python.overridePythonAttrs (old: {
buildInputs = old.buildInputs ++ [ pkgs.systemd ];
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.systemd ];
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
});
@ -2908,7 +2908,7 @@ lib.composeManyExtensions [
libGL
libglvnd
mesa
] ++ old.buildInputs;
] ++ (old.buildInputs or [ ]);
buildPhase = ''
${localPython.interpreter} build.py -v build_wx