diff options
| author | Rodney Lorrimar <dev@rodney.id.au> | 2021-05-12 22:15:17 +1000 |
|---|---|---|
| committer | Rodney Lorrimar <dev@rodney.id.au> | 2021-05-13 10:01:50 +1000 |
| commit | c46059f732af696357e59043a771282a610130eb (patch) | |
| tree | be2dc41650ec0f2eeb866ca8483e3d16fbf7d29b /pkgs/applications/window-managers/taffybar | |
| parent | 80969cc4ec0ac4aa1bcb677263cdd0ad2085158f (diff) | |
| download | nixpkgs-c46059f732af696357e59043a771282a610130eb.tar nixpkgs-c46059f732af696357e59043a771282a610130eb.tar.gz nixpkgs-c46059f732af696357e59043a771282a610130eb.tar.bz2 nixpkgs-c46059f732af696357e59043a771282a610130eb.tar.lz nixpkgs-c46059f732af696357e59043a771282a610130eb.tar.xz nixpkgs-c46059f732af696357e59043a771282a610130eb.tar.zst nixpkgs-c46059f732af696357e59043a771282a610130eb.zip | |
taffybar: restore ability to override ghcWithPackages arg
Diffstat (limited to 'pkgs/applications/window-managers/taffybar')
| -rw-r--r-- | pkgs/applications/window-managers/taffybar/default.nix | 15 |
1 files changed, 12 insertions, 3 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; } |