From c7e2263d644d7db92aa87b757cb713965aa20a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Wed, 22 Nov 2023 01:51:48 +0100
Subject: [PATCH] =?UTF-8?q?nix:=20nom=20nom=20=F0=9F=98=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/nix/build-pindakaas-image.sh | 21 ++++++++++++---------
 config/nix/build-vm.sh              | 10 +++++++---
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/config/nix/build-pindakaas-image.sh b/config/nix/build-pindakaas-image.sh
index 2d679c5..da22a96 100755
--- a/config/nix/build-pindakaas-image.sh
+++ b/config/nix/build-pindakaas-image.sh
@@ -2,19 +2,22 @@
 
 # Build a disk image for testing on pindakaas via sd card
 
+if ! command -v nom-build
+then
+    exec nix-shell -p nix-output-monitor --run $0
+fi
+
 export NIXPKGS_ALLOW_UNFREE=1
 extra=""
 if [ "$(uname -m)" != "aarch64" ]
 then
-    # If we have binfmt QEMU (https://nixos.wiki/wiki/NixOS_on_ARM#Compiling_through_binfmt_QEMU),
-    # we can pretend we're aarch64.
-    if [ -f /proc/sys/fs/binfmt_misc/qemu-aarch64 ]
+    if [ ! -f /proc/sys/fs/binfmt_misc/qemu-aarch64 ]
     then
-        extra="--argstr system aarch64-linux"
-    # Otherwise, use cross-compilation...
-    # theorically faster but doesn't use the cache and never got it to build a full customized image
-    else
-        extra="--argstr nixpkgs.crossSystem.system aarch64-linux"
+        echo "Use binfmt QEMU!"
+        echo "https://nixos.wiki/wiki/NixOS_on_ARM#Compiling_through_binfmt_QEMU"
+        exit 1
     fi
+    extra="--argstr system aarch64-linux"
 fi
-nix-build '<nixpkgs/nixos>' -A config.system.build.sdImage -I nixos-config=./pindakaas.nix $extra --show-trace
+nom-build '<nixpkgs/nixos>' -A config.system.build.sdImage \
+    -I nixos-config=./pindakaas.nix $extra --show-trace
diff --git a/config/nix/build-vm.sh b/config/nix/build-vm.sh
index b1da329..a9d06ef 100755
--- a/config/nix/build-vm.sh
+++ b/config/nix/build-vm.sh
@@ -5,6 +5,11 @@
 # For x86_64 hosts: use curacao config
 # For aarch64 hosts: use pindakaas config
 
+if ! command -v nom-build
+then
+    exec nix-shell -p nix-output-monitor --run $0
+fi
+
 export NIXPKGS_ALLOW_UNFREE=1
 if [ "$(uname -m)" == "x86_64" ]
 then
@@ -13,6 +18,5 @@ elif [ "$(uname -m)" == "aarch64" ]
 then
     config=./pindakaas.nix
 fi
-nix-build '<nixpkgs/nixos>' -A vm \
--I nixpkgs=channel:nixos-23.05 \
--I nixos-config=${config}
+nom-build '<nixpkgs/nixos>' -A vm \
+    -I nixos-config=${config}