commit ca2969bd23fbeb24633192d5e2f7047fe89de1bd
parent 2da68e9f902b4ca9f519d00c95372cef9426b415
Author: William Casarin <jb55@jb55.com>
Date: Mon, 2 Nov 2020 11:56:16 -0800
nix: fix server builds
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nix-config/configuration.nix b/nix-config/configuration.nix
@@ -5,7 +5,7 @@
{ config, pkgs, ... }:
let machine = extra.private.machine;
- isDesktop = true;
+ isDesktop = machine != "charon";
machinePath = p: let m = "/" + machine;
in ./machines + m + p;
machineConfig = import (machinePath "/config") pkgs;
@@ -68,7 +68,7 @@ in {
# Use the GRUB 2 boot loader.
boot.loader.grub.enable = true;
- environment.ld-linux = false;
+ #environment.ld-linux = false;
systemd.extraConfig = ''
DefaultTimeoutStopSec=10s
DefaultTimeoutStartSec=20s