patches and low-level development discussion
 help / color / mirror / code / Atom feed
From: Ville Ilvonen <ville.ilvonen@unikie.com>
To: devel@spectrum-os.org
Cc: Ville Ilvonen <ville.ilvonen@unikie.com>
Subject: [PATCH] fix: config support with vms
Date: Tue, 20 Sep 2022 14:09:58 +0300	[thread overview]
Message-ID: <20220920110958.2548848-1-ville.ilvonen@unikie.com> (raw)

with config.nix, the build of vms fails with
error: undefined variable 'pkgs'
..
  49|
  50|   kernel = pkgs.linux_latest.override {
    |            ^

This fixes the issue for all default vms

Signed-off-by: Ville Ilvonen <ville.ilvonen@unikie.com>
---
 vm/app/catgirl/default.nix | 1 +
 vm/app/lynx/default.nix    | 1 +
 vm/sys/net/default.nix     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/vm/app/catgirl/default.nix b/vm/app/catgirl/default.nix
index 61f1462..c33f512 100644
--- a/vm/app/catgirl/default.nix
+++ b/vm/app/catgirl/default.nix
@@ -13,6 +13,7 @@ config.pkgs.pkgsStatic.callPackage (
 }:
 
 let
+  inherit (config) pkgs;
   inherit (lib) cleanSource cleanSourceWith concatMapStringsSep hasSuffix;
 
   packages = [
diff --git a/vm/app/lynx/default.nix b/vm/app/lynx/default.nix
index ba715ec..f06ef1f 100644
--- a/vm/app/lynx/default.nix
+++ b/vm/app/lynx/default.nix
@@ -13,6 +13,7 @@ config.pkgs.pkgsStatic.callPackage (
 }:
 
 let
+  inherit (config) pkgs;
   inherit (lib) cleanSource cleanSourceWith concatMapStringsSep hasSuffix;
 
   packages = [
diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix
index dfc7c35..b3dac9a 100644
--- a/vm/sys/net/default.nix
+++ b/vm/sys/net/default.nix
@@ -14,6 +14,7 @@ config.pkgs.pkgsStatic.callPackage (
 }:
 
 let
+  inherit (config) pkgs;
   inherit (lib) cleanSource cleanSourceWith concatMapStringsSep hasSuffix;
 
   connman = connmanMinimal;
-- 
2.37.2



             reply	other threads:[~2022-09-20 11:10 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-20 11:09 Ville Ilvonen [this message]
2022-09-20 11:31 ` [PATCH] fix: config support with vms Alyssa Ross
2022-09-20 11:34   ` Ville Ilvonen
2022-09-20 11:42     ` Alyssa Ross
2022-09-20 11:46       ` Ville Ilvonen
2022-09-20 11:59         ` Alyssa Ross
2022-09-20 12:17           ` Ville Ilvonen

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=20220920110958.2548848-1-ville.ilvonen@unikie.com \
    --to=ville.ilvonen@unikie.com \
    --cc=devel@spectrum-os.org \
    /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).