diff options
author | maralorn <malte.brandy@maralorn.de> | 2021-05-07 23:55:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-07 23:55:19 +0200 |
commit | 958855d30c43bd73ed863b98bfae513729afff20 (patch) | |
tree | fcfcf31bd67d094a898d01b7c1c1ac9c5876bee4 /pkgs/applications/window-managers | |
parent | c16380b5b46872c011d6aad9b7698e08fe6041a7 (diff) | |
parent | 93b42b12db28c6427649e71ab9103f3bdec8ffbc (diff) |
Merge pull request #121627 from NixOS/haskell-updates
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/taffybar/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index cc457f8158994..da495606930d0 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -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; } |