public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

taffybar: restore ability to override ghcWithPackages arg

This commit is contained in:
Rodney Lorrimar 2021-05-12 22:15:17 +10:00
parent 80969cc4ec
commit c46059f732
No known key found for this signature in database
GPG Key ID: D8B75C95FB4D1143
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/window-managers/taffybar/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, haskellPackages, makeWrapper, packages ? (x: []) }: { lib, stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }:
let let
taffybarEnv = haskellPackages.ghc.withPackages (self: [ taffybarEnv = ghcWithPackages (self: [
self.taffybar self.taffybar
] ++ packages self); ] ++ packages self);
in stdenv.mkDerivation { in stdenv.mkDerivation {
@ -15,5 +15,14 @@ in stdenv.mkDerivation {
--set NIX_GHC "${taffybarEnv}/bin/ghc" --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;
} }

4
pkgs/top-level/all-packages.nix
View File

@ -26320,7 +26320,9 @@ in
# customConfig = builtins.readFile ./tabbed.config.h; # 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 {}; tagainijisho = callPackage ../applications/office/tagainijisho {};