about summary refs log tree commit diff
path: root/users/grfn/system
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2022-12-12T09·48+0100
committersterni <sternenseemann@systemli.org>2022-12-19T12·44+0000
commitfcdf5d2845058126716fe5604a2a5726c926c124 (patch)
tree9ec94471cbbc2b3d42492d14655283514fd16ee3 /users/grfn/system
parentd026a021b7fb0c9c7206f5c6d8094d297dc0b462 (diff)
chore(3p/sources): Bump channels & overlays r/5426
* //users/grfn/modules/games: StoneSense requires DFHack to be enabled

* //users/grfn/system/iso: gtk needs cairo with xlibs

* //users: deal with emacs-overlay attribute renames

* //3p/overlays: downgrade sbcl to workaround lisp-binary compilation
  failure

Change-Id: I1573280a923e5021ef399734cb5519b37e72c670
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7563
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
Diffstat (limited to 'users/grfn/system')
-rw-r--r--users/grfn/system/home/modules/games.nix2
-rw-r--r--users/grfn/system/system/iso.nix4
2 files changed, 5 insertions, 1 deletions
diff --git a/users/grfn/system/home/modules/games.nix b/users/grfn/system/home/modules/games.nix
index 873182663020..5e2800389208 100644
--- a/users/grfn/system/home/modules/games.nix
+++ b/users/grfn/system/home/modules/games.nix
@@ -11,7 +11,7 @@ let
     theme = null;
     enableIntro = false;
     enableFPS = true;
-    enableDFHack = false; # Fails to build currently
+    enableDFHack = true;
   });
 
   init = runCommand "init.txt" { } ''
diff --git a/users/grfn/system/system/iso.nix b/users/grfn/system/system/iso.nix
index 9fa8e7ec7e3b..398145f1cfab 100644
--- a/users/grfn/system/system/iso.nix
+++ b/users/grfn/system/system/iso.nix
@@ -11,6 +11,10 @@ let
     networking.useDHCP = false;
     networking.firewall.enable = false;
     networking.wireless.enable = lib.mkForce false;
+
+    # TODO(grfn): enabling this (in the minimal profile) fails the iso build,
+    # since gtk+3 needs to be built which fails due to cairo without xlibs
+    environment.noXlibs = false;
   };
 in
 (depot.third_party.nixos {