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

fix: wrong buildInputs selected due to name changes

Browse source
This commit is contained in:
DavHau 2020-10-11 13:45:45 +07:00
parent a24c33fb80
commit b02f915b7a
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mach_nix/generators/overides_generator.py
View file

@ -184,14 +184,10 @@ class OverridesGenerator(ExpressionGenerator):
if pkg.name not in overrides_keys:
continue
overlays_required = True
# get correct build input names
_build_inputs = [self._get_ref_name(b, pkgs[b].ver) for b in pkg.build_inputs]
build_inputs_local = {b for b in _build_inputs if b in overrides_keys}
build_inputs_nixpkgs = set(_build_inputs) - build_inputs_local
# get correct propagated build input names
_prop_build_inputs = [self._get_ref_name(b, pkgs[b].ver) for b in pkg.prop_build_inputs]
prop_build_inputs_local = {b for b in _prop_build_inputs if b in overrides_keys}
prop_build_inputs_nixpkgs = set(_prop_build_inputs) - prop_build_inputs_local
build_inputs_local = {b for b in pkg.build_inputs if b in overrides_keys}
build_inputs_nixpkgs = set(pkg.build_inputs) - build_inputs_local
prop_build_inputs_local = {b for b in pkg.prop_build_inputs if b in overrides_keys}
prop_build_inputs_nixpkgs = set(pkg.prop_build_inputs) - prop_build_inputs_local
# convert build inputs to string
build_inputs_str = self._gen_build_inputs(build_inputs_local, build_inputs_nixpkgs, ).strip()
# convert prop build inputs to string