From 475a406c487f5d1200651476c1243bf8d7884966 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sat, 3 Apr 2021 11:59:20 +0200
Subject: modules/devhell/profiles/services: conditionally include
 i3-auto-layout

i3-auto-layout is not yet in nixos-unstable unfortunately, so it
triggers an eval error on hydra. Temporarily hack around it by only
including it in extraPackages if pkgs contains the package in question
(i. e. if rebuilding from master locally).

cc @devhell
---
 modules/user/devhell/profiles/services.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/devhell/profiles/services.nix b/modules/user/devhell/profiles/services.nix
index b2c63fd4..aa6d21ca 100644
--- a/modules/user/devhell/profiles/services.nix
+++ b/modules/user/devhell/profiles/services.nix
@@ -78,8 +78,9 @@ in {
     services.xserver.windowManager.i3 = {
       enable = true;
       package = pkgs.i3-gaps;
-      extraPackages = with pkgs; [ polybar i3status-rust i3blocks-gaps
-                                   i3-auto-layout rofi ];
+      extraPackages = with pkgs; [ polybar i3status-rust i3blocks-gaps rofi ]
+        ++ lib.optional (pkgs ? i3-auto-layout) [ pkgs.i3-auto-layout ];
+      # FIXME: lib.optional construct can be removed if i3-auto-layout is in unstable
     };
 
     services.journald.extraConfig = ''
-- 
cgit 1.4.1