Skip to content
Snippets Groups Projects
Commit 22986543 authored by Astro's avatar Astro :gear:
Browse files

nix: fix firmware src override

parent da5e59bc
No related branches found
No related tags found
No related merge requests found
Pipeline #3829 failed
...@@ -32,5 +32,8 @@ let ...@@ -32,5 +32,8 @@ let
done done
''; '';
}; };
firmware = lib.makeOverridable (a: import a.src) { src = cSrc; }; firmware = lib.makeOverridable (attrs: {
inherit (attrs) src;
firmware = import attrs.src;
}) { src = cSrc; };
in firmware in firmware
...@@ -3,11 +3,12 @@ ...@@ -3,11 +3,12 @@
with pkgs; with pkgs;
let let
firmware = ((import ../firmware.nix { firmwareSrc = import ../firmware.nix {
inherit pkgs; inherit pkgs;
src = <firmware>; src = <firmware>;
srcPath = "."; srcPath = ".";
}).override (oldArgs: { };
firmwareGit = firmwareSrc.override (oldArgs: {
src = oldArgs.src.overrideAttrs (oldAttrs: { src = oldArgs.src.overrideAttrs (oldAttrs: {
name = "${oldAttrs.name}-git"; name = "${oldAttrs.name}-git";
# no more git, .git is dropped by Hydra # no more git, .git is dropped by Hydra
...@@ -22,7 +23,8 @@ let ...@@ -22,7 +23,8 @@ let
--replace "git -C" echo --replace "git -C" echo
''; '';
}); });
})).overrideAttrs (oldAttrs: { });
firmware = firmwareGit.firmware.overrideAttrs (oldAttrs: {
buildCommand = '' buildCommand = ''
${oldAttrs.buildCommand} ${oldAttrs.buildCommand}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment