diff options
Diffstat (limited to 'release/live')
| -rw-r--r-- | release/live/Makefile | 12 | ||||
| -rw-r--r-- | release/live/default.nix | 2 | ||||
| -rw-r--r-- | release/live/shell.nix | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/release/live/Makefile b/release/live/Makefile index f887f0a..4eeeaa6 100644 --- a/release/live/Makefile +++ b/release/live/Makefile @@ -1,17 +1,7 @@ # SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is> -# qemu-kvm is non-standard, but is present in at least Fedora and -# Nixpkgs. If you don't have qemu-kvm, you'll need to set e.g. -# QEMU_KVM = qemu-system-x86_64 -enable-kvm. -QEMU_KVM = qemu-kvm - -MCOPY = mcopy -MKFS_FAT = mkfs.fat -MMD = mmd -OBJCOPY = objcopy -TRUNCATE = truncate -VERITYSETUP = veritysetup +include ../../lib/common.mk build/live.img: ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh build/boot.fat build/rootfs.verity.superblock build/rootfs.verity.roothash $(ROOT_FS) $(EXT_FS) ../../scripts/make-gpt.sh $@.tmp \ diff --git a/release/live/default.nix b/release/live/default.nix index c36c34b..cdbd348 100644 --- a/release/live/default.nix +++ b/release/live/default.nix @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is> # SPDX-FileCopyrightText: 2022 Unikie -import ../../nix/eval-config.nix ({ config, src, ... }: +import ../../lib/eval-config.nix ({ config, src, ... }: config.pkgs.callPackage ( { stdenvNoCC, cryptsetup, dosfstools, jq, mtools, util-linux, stdenv diff --git a/release/live/shell.nix b/release/live/shell.nix index 7cec144..577b714 100644 --- a/release/live/shell.nix +++ b/release/live/shell.nix @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT # SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is> -import ../../nix/eval-config.nix ({ config, ... }: +import ../../lib/eval-config.nix ({ config, ... }: with config.pkgs; |