From c46059f732af696357e59043a771282a610130eb Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Wed, 12 May 2021 22:15:17 +1000 Subject: [PATCH] taffybar: restore ability to override ghcWithPackages arg --- .../window-managers/taffybar/default.nix | 15 ++++++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index da495606930..7d9e5f9c1cb 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, haskellPackages, makeWrapper, packages ? (x: []) }: +{ lib, stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }: let - taffybarEnv = haskellPackages.ghc.withPackages (self: [ + taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self); in stdenv.mkDerivation { @@ -15,5 +15,14 @@ in stdenv.mkDerivation { --set NIX_GHC "${taffybarEnv}/bin/ghc" ''; - inherit (haskellPackages.taffybar) meta; + # Trivial derivation + preferLocalBuild = true; + allowSubstitutes = false; + + # For hacking purposes + passthru.env = taffybarEnv; + buildInputs = [ taffybarEnv ]; + shellHook = "eval $(egrep ^export ${taffybarEnv}/bin/ghc)"; + + inherit (taffybar) meta; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7cfe7eaf95..f126e817b6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26320,7 +26320,9 @@ in # customConfig = builtins.readFile ./tabbed.config.h; }; - taffybar = callPackage ../applications/window-managers/taffybar {}; + taffybar = callPackage ../applications/window-managers/taffybar { + inherit (haskellPackages) ghcWithPackages taffybar; + }; tagainijisho = callPackage ../applications/office/tagainijisho {};