From 07acb8985844bf1df34eeab13abc0f6ca279d93f Mon Sep 17 00:00:00 2001
From: Alexander Foremny <aforemny@posteo.de>
Date: Sun, 21 Jul 2024 17:41:45 +0200
Subject: fix: depend on sensors

---
 default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'default.nix')

diff --git a/default.nix b/default.nix
index dc2a890..a821a15 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,6 @@
-{ pkgs ? import (import ./nix/sources.nix).nixpkgs { } }:
+{ pkgs ? import sources.nixpkgs { }
+, sources ? import ./nix/sources.nix
+}:
 let
   haskellPackages = pkgs.haskellPackages.override {
     overrides = self: super: {
@@ -12,7 +14,8 @@ let
             --zsh  <($out/bin/$exe --zsh-completion-script $out/bin/$exe)
         '';
       });
-      sh = pkgs.haskell.lib.dontCheck (self.callCabal2nix "sh" (import ./nix/sources.nix).sh { });
+      sensors = pkgs.haskell.lib.dontCheck (self.callCabal2nix "sensors" sources.sensors { });
+      sh = pkgs.haskell.lib.dontCheck (self.callCabal2nix "sh" sources.sh { });
       statvfs = pkgs.haskell.lib.markUnbroken (super.statvfs.overrideAttrs (oldAtts: {
         patches = [
           (pkgs.writers.writeText "statvfs.patch" ''
@@ -29,6 +32,7 @@ let
           '')
         ];
       }));
+      # XXX we don't need to depend on patched X11 anymore
       X11 = (self.callCabal2nix "X11"
         (pkgs.fetchFromGitHub {
           owner = "aforemny";
@@ -48,7 +52,7 @@ rec {
   inherit haskellPackages;
   inherit (haskellPackages) astatusbar;
   shell = haskellPackages.shellFor {
-    packages = _: [ haskellPackages.astatusbar ];
+    packages = _: [ astatusbar ];
     buildInputs = [
       pkgs.cabal-install
       (pkgs.nerdfonts.override { fonts = [ "IosevkaTerm" ]; })
-- 
cgit v1.2.3