alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

taffybar: inherit meta set from haskellPackages

Browse source
This commit is contained in:
sternenseemann 2021-05-06 19:54:22 +02:00
parent 0781c31545
commit fc1638c3ba
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/window-managers/taffybar/default.nix
View file

@ -1,7 +1,9 @@
{ lib, stdenv, ghcWithPackages, makeWrapper, packages ? (x: []) }:
{ lib, stdenv, haskellPackages, makeWrapper, packages ? (x: []) }:
let
taffybarEnv = ghcWithPackages (self: [ self.taffybar ] ++ packages self);
taffybarEnv = haskellPackages.ghc.withPackages (self: [
self.taffybar
] ++ packages self);
in stdenv.mkDerivation {
name = "taffybar-with-packages-${taffybarEnv.version}";
@ -13,8 +15,5 @@ in stdenv.mkDerivation {
--set NIX_GHC "${taffybarEnv}/bin/ghc"
'';
meta = {
platforms = lib.platforms.unix;
license = lib.licenses.bsd3;
};
inherit (haskellPackages.taffybar) meta;
}

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

@ -26248,9 +26248,7 @@ in
# customConfig = builtins.readFile ./tabbed.config.h;
};
taffybar = callPackage ../applications/window-managers/taffybar {
inherit (haskellPackages) ghcWithPackages;
};
taffybar = callPackage ../applications/window-managers/taffybar {};
tagainijisho = callPackage ../applications/office/tagainijisho {};