From 42954e7214625ae9d31d8206cddf03db0e011687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Thu, 23 Nov 2023 13:21:29 +0100 Subject: [PATCH] nix: Move unfree allowing into os config Might need the same for HM config? --- config/nix/build-pindakaas-image.sh | 1 - config/nix/build-vm.sh | 1 - config/nix/os/common.nix | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/nix/build-pindakaas-image.sh b/config/nix/build-pindakaas-image.sh index da22a96..e48ebd1 100755 --- a/config/nix/build-pindakaas-image.sh +++ b/config/nix/build-pindakaas-image.sh @@ -7,7 +7,6 @@ then exec nix-shell -p nix-output-monitor --run $0 fi -export NIXPKGS_ALLOW_UNFREE=1 extra="" if [ "$(uname -m)" != "aarch64" ] then diff --git a/config/nix/build-vm.sh b/config/nix/build-vm.sh index a9d06ef..4cb07b0 100755 --- a/config/nix/build-vm.sh +++ b/config/nix/build-vm.sh @@ -10,7 +10,6 @@ then exec nix-shell -p nix-output-monitor --run $0 fi -export NIXPKGS_ALLOW_UNFREE=1 if [ "$(uname -m)" == "x86_64" ] then config=./curacao.nix diff --git a/config/nix/os/common.nix b/config/nix/os/common.nix index eedc29d..6bdf5be 100644 --- a/config/nix/os/common.nix +++ b/config/nix/os/common.nix @@ -30,6 +30,8 @@ android-udev-rules ]; + nixpkgs.config.allowUnfree = true; + programs = { # Enable compilation cache ccache.enable = true;