From 22986543f613df745eb249e797599afc5f39c492 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Thu, 5 Sep 2019 21:11:59 +0200
Subject: [PATCH] nix: fix firmware src override
---
firmware.nix | 5 ++++-
hydra/firmware.nix | 8 +++++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/firmware.nix b/firmware.nix
index 3219d61..36e0fff 100644
--- a/firmware.nix
+++ b/firmware.nix
@@ -32,5 +32,8 @@ let
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
diff --git a/hydra/firmware.nix b/hydra/firmware.nix
index 5e50955..d85fb90 100644
--- a/hydra/firmware.nix
+++ b/hydra/firmware.nix
@@ -3,11 +3,12 @@
with pkgs;
let
- firmware = ((import ../firmware.nix {
+ firmwareSrc = import ../firmware.nix {
inherit pkgs;
src = <firmware>;
srcPath = ".";
- }).override (oldArgs: {
+ };
+ firmwareGit = firmwareSrc.override (oldArgs: {
src = oldArgs.src.overrideAttrs (oldAttrs: {
name = "${oldAttrs.name}-git";
# no more git, .git is dropped by Hydra
@@ -22,7 +23,8 @@ let
--replace "git -C" echo
'';
});
- })).overrideAttrs (oldAttrs: {
+ });
+ firmware = firmwareGit.firmware.overrideAttrs (oldAttrs: {
buildCommand = ''
${oldAttrs.buildCommand}
--
GitLab