about summary refs log tree commit diff
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2022-04-21T09·33+0200
committerProfpatsch <mail@profpatsch.de>2022-04-21T10·19+0000
commitc8ef9fcfa758cabb331e5469d45c155f73242174 (patch)
tree625654c8c852af62618fdb1a643083f42eb4d8e6
parent6716bf018c465f4b943eef0e6716caa7a54940da (diff)
fix(users/Profpatsch/alacritty): use alacritty from stable r/3983
Change-Id: I8a3f22dd752b5cd70518424335de876210e9bcd4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5487
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
-rw-r--r--third_party/nixpkgs/default.nix9
-rw-r--r--users/Profpatsch/alacritty.nix2
2 files changed, 8 insertions, 3 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index 635082e27be3..a260fdef4f25 100644
--- a/third_party/nixpkgs/default.nix
+++ b/third_party/nixpkgs/default.nix
@@ -24,8 +24,13 @@ let
 
   # Overlay for packages that should come from the stable channel
   # instead (e.g. because something is broken in unstable).
-  stableOverlay = self: super: {
-    # Nothing picked from stable presently.
+  # Use `stableNixpkgs` from above.
+  stableOverlay = _unstableSelf: _unstableSuper: {
+
+    # alacritty on unstable fails because it can’t find the libGLX.
+    # This is too hard to debug right now, let’s hope somebody else solves it for us.
+    alacritty-stable = stableNixpkgs.alacritty;
+
   };
 
   # Overlay to expose the nixpkgs commits we are using to other Nix code.
diff --git a/users/Profpatsch/alacritty.nix b/users/Profpatsch/alacritty.nix
index d2cb8de2fc86..2512de3b0966 100644
--- a/users/Profpatsch/alacritty.nix
+++ b/users/Profpatsch/alacritty.nix
@@ -1,7 +1,7 @@
 { depot, pkgs, lib, ... }:
 
 let
-  bins = depot.nix.getBins pkgs.alacritty [ "alacritty" ];
+  bins = depot.nix.getBins pkgs.alacritty-stable [ "alacritty" ];
 
   config =
     depot.users.Profpatsch.importDhall.importDhall {