From 6fe6f49707f8082cdbaf123a2d7556d3d4fa41cb Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 2 Feb 2021 09:42:41 +0100 Subject: [PATCH] Makefile: remove weirdness --- Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index bb3c3a0..803a0c6 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,12 @@ default: system image -EXTRA_OPTIONS := \ - --store /scratch/ \ - --builders 'aarch64.nixos.community aarch64-linux - 64 64 big-parallel' \ - --extra-substituters /?trusted=true \ - --secret-key-files '' +NIXPKGS := channel:nixos-20.09 system: configuration.nix helios64.nix nix-build '' \ --arg configuration ./configuration.nix \ -A config.system.build.toplevel \ - -I nixpkgs=$(HOME)/nixpkgs/helios64 \ + -I nixpkgs=$(NIXPKGS) \ -o $@ \ $(EXTRA_OPTIONS) @@ -18,7 +14,7 @@ image: emmc-image.nix configuration.nix helios64.nix nix-build '' \ --arg configuration ./emmc-image.nix \ -A config.system.build.sdImage \ - -I nixpkgs=$(HOME)/nixpkgs/helios64 \ + -I nixpkgs=$(NIXPKGS) \ -o $@ \ $(EXTRA_OPTIONS)