nix #11

Manually merged
geoffrey merged 113 commits from nix into main 2023-12-09 21:43:01 +01:00
3 changed files with 2 additions and 2 deletions
Showing only changes of commit 42954e7214 - Show all commits

View file

@ -7,7 +7,6 @@ then
exec nix-shell -p nix-output-monitor --run $0 exec nix-shell -p nix-output-monitor --run $0
fi fi
export NIXPKGS_ALLOW_UNFREE=1
extra="" extra=""
if [ "$(uname -m)" != "aarch64" ] if [ "$(uname -m)" != "aarch64" ]
then then

View file

@ -10,7 +10,6 @@ then
exec nix-shell -p nix-output-monitor --run $0 exec nix-shell -p nix-output-monitor --run $0
fi fi
export NIXPKGS_ALLOW_UNFREE=1
if [ "$(uname -m)" == "x86_64" ] if [ "$(uname -m)" == "x86_64" ]
then then
config=./curacao.nix config=./curacao.nix

View file

@ -30,6 +30,8 @@
android-udev-rules android-udev-rules
]; ];
nixpkgs.config.allowUnfree = true;
programs = { programs = {
# Enable compilation cache # Enable compilation cache
ccache.enable = true; ccache.enable = true;