From d566336d5eb455f1c9631b0ce9a0e957f7fcbd38 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Tue, 30 Jul 2024 10:57:08 +0200 Subject: [PATCH] feat(iso): Use default nixpkgs version --- iso/build-iso.sh | 2 +- iso/nixpkgs.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/iso/build-iso.sh b/iso/build-iso.sh index 2586426..a210aad 100755 --- a/iso/build-iso.sh +++ b/iso/build-iso.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -NIXPKGS=$(nix-build nixpkgs.nix) +NIXPKGS=$(nix-build --no-out-link nixpkgs.nix) nixos-generate -c configuration.nix -I NIX_PATH="$NIXPKGS" -f install-iso diff --git a/iso/nixpkgs.nix b/iso/nixpkgs.nix index 339b092..c859113 100644 --- a/iso/nixpkgs.nix +++ b/iso/nixpkgs.nix @@ -1,5 +1,6 @@ let - inherit (import ../npins) nixpkgs; + version = (import ../meta/nixpkgs.nix).default; + nixpkgs = (import ../npins)."nixos-${version}"; in (import nixpkgs { }).srcOnly {