diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index cc457f81589..da495606930 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; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03c414f57c9..50b6c680320 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {};