diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-13 12:26:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-13 12:26:52 +0000 |
| commit | 60f5ecc76d85d74e33c7f3440ca5f41fd803b07e (patch) | |
| tree | 2c83abce60986120efa0c81c6b70296ecfb181ec /pkgs/applications/window-managers | |
| parent | 0313c77b55402ae4eb149c726c7d738f2d60d62f (diff) | |
| parent | 74655944285aadf77fd7b36612b39fd5df411338 (diff) | |
| download | nixpkgs-60f5ecc76d85d74e33c7f3440ca5f41fd803b07e.tar nixpkgs-60f5ecc76d85d74e33c7f3440ca5f41fd803b07e.tar.gz nixpkgs-60f5ecc76d85d74e33c7f3440ca5f41fd803b07e.tar.bz2 nixpkgs-60f5ecc76d85d74e33c7f3440ca5f41fd803b07e.tar.lz nixpkgs-60f5ecc76d85d74e33c7f3440ca5f41fd803b07e.tar.xz nixpkgs-60f5ecc76d85d74e33c7f3440ca5f41fd803b07e.tar.zst nixpkgs-60f5ecc76d85d74e33c7f3440ca5f41fd803b07e.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/window-managers')
| -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; } |