yogsototh/mach-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

also replace nativeBuildInputs on overridden nixpkgs candidates

Browse source
This commit is contained in:
DavHau 2020-12-21 13:40:59 +07:00
parent 8a719adddf
commit 20e50610f2
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mach_nix/generators/overides_generator.py
View file

@ -144,12 +144,14 @@ class OverridesGenerator(ExpressionGenerator):
def _gen_overrideAttrs(
self, name, ver, circular_deps, nix_name, provider, build_inputs_str, prop_build_inputs_str,
keep_src=False):
# TODO: apply the buildInput replacement to all kinds of buildInputs
out = f"""
"{name}" = override python-super.{nix_name} ( oldAttrs: {{
pname = "{name}";
version = "{ver}";
passthru = (get_passthru "{name}" "{nix_name}") // {{ provider = "{provider}"; }};
buildInputs = with python-self; (replace_deps oldAttrs "buildInputs" self) ++ [ {build_inputs_str} ];
nativeBuildInputs = with python-self; (replace_deps oldAttrs "nativeBuildInputs" self) ++ [ {build_inputs_str} ];
propagatedBuildInputs = with python-self; (replace_deps oldAttrs "propagatedBuildInputs" self) ++ [ {prop_build_inputs_str} ];"""
if not keep_src:
out += f"""

3
mach_nix/nix/buildPythonPackage.nix
View file

@ -63,8 +63,7 @@ let
in
py_final.pkgs."${func}" ( pass_args // {
propagatedBuildInputs =
(result.select_pkgs py_final.pkgs)
++ (if hasAttr "propagatedBuildInputs" args then args.propagatedBuildInputs else []);
(result.select_pkgs py_final.pkgs) ++ (args.propagatedBuildInputs or []);
src = src;
inherit doCheck pname version;
passthru = passthru // {