From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Cc: "José Pekkarinen" <jose.pekkarinen@unikie.com>,
"Ivan Nikolaenko" <ivan.nikolaenko@unikie.com>
Subject: [PATCH 2/4] nix: prefer build configs from <spectrum-config>
Date: Wed, 31 Aug 2022 09:37:25 +0000 [thread overview]
Message-ID: <20220831093727.282797-2-hi@alyssa.is> (raw)
In-Reply-To: <20220831093727.282797-1-hi@alyssa.is>
This will make it easier to use multiple configs, e.g. for different
boards.
Signed-off-by: Alyssa Ross <hi@alyssa.is>
---
nix/eval-config.nix | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/nix/eval-config.nix b/nix/eval-config.nix
index 9265df7..467f877 100644
--- a/nix/eval-config.nix
+++ b/nix/eval-config.nix
@@ -2,7 +2,10 @@
# SPDX-FileCopyrightText: 2022 Unikie
{ config ?
- if builtins.pathExists ../config.nix then import ../config.nix else {}
+ let customPath = builtins.tryEval <spectrum-config>; in
+ if customPath.success then import customPath.value
+ else if builtins.pathExists ../config.nix then import ../config.nix
+ else {}
}:
({ pkgs ? import <nixpkgs> {} }: {
--
2.37.1
next prev parent reply other threads:[~2022-08-31 9:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-31 9:37 [PATCH 1/4] Introduce a build configuration file Alyssa Ross
2022-08-31 9:37 ` Alyssa Ross [this message]
2022-09-08 11:40 ` [PATCH 2/4] nix: prefer build configs from <spectrum-config> José Pekkarinen
2022-09-14 6:58 ` Alyssa Ross
2022-08-31 9:37 ` [PATCH 3/4] Documentation/jekyll: patch for AsciiDoc examples Alyssa Ross
2022-09-14 7:03 ` Alyssa Ross
2022-08-31 9:37 ` [PATCH 4/4] Documentation: document build configuration file Alyssa Ross
2022-09-14 6:58 ` Alyssa Ross
2022-09-06 5:53 ` [PATCH 1/4] Introduce a " Ville Ilvonen
[not found] ` <87fsh5c60x.fsf@alyssa.is>
2022-09-08 11:39 ` José Pekkarinen
2022-09-14 6:58 ` Alyssa Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220831093727.282797-2-hi@alyssa.is \
--to=hi@alyssa.is \
--cc=devel@spectrum-os.org \
--cc=ivan.nikolaenko@unikie.com \
--cc=jose.pekkarinen@unikie.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).