[taffybar] [NixOS] Just use remote taffybar for now
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
nixpkgs.url = "github:colonelpanic8/nixpkgs/remove-gi-gtk-hs-patch";
|
||||
xmonad.url = "github:xmonad/xmonad/master";
|
||||
taffybar = {
|
||||
url = "git+file:./taffybar";
|
||||
url = "github:taffybar/taffybar/master";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.xmonad.follows = "xmonad";
|
||||
};
|
||||
@@ -12,30 +12,19 @@
|
||||
outputs = { self, flake-utils, taffybar, nixpkgs, xmonad }:
|
||||
let
|
||||
hoverlay = final: prev: hself: hsuper:
|
||||
let
|
||||
fixGiVersionPackage = drv:
|
||||
let
|
||||
overridden = drv.override {
|
||||
gi-gtk = hself.gi-gtk3;
|
||||
gi-gdk = hself.gi-gdk3;
|
||||
};
|
||||
in prev.haskell.lib.overrideCabal overridden (oa: {
|
||||
postPatch = (oa.postPatch or "") + ''
|
||||
substituteInPlace ${oa.pname}.cabal \
|
||||
--replace-fail "gi-gtk " "gi-gtk3 " \
|
||||
--replace-fail "gi-gdk " "gi-gdk3 "
|
||||
'';
|
||||
});
|
||||
in {
|
||||
taffybar = hsuper.taffybar.overrideAttrs (_: {
|
||||
{
|
||||
taffybar = prev.haskell.lib.overrideCabal hsuper.taffybar (oa: {
|
||||
doHaddock = false;
|
||||
doCheck = false;
|
||||
# Fix for GHC 9.4 where liftA2 is not in Prelude
|
||||
postPatch = (oa.postPatch or "") + ''
|
||||
substituteInPlace src/System/Taffybar/DBus/Client/Util.hs \
|
||||
--replace-fail "import Control.Monad (forM)" \
|
||||
"import Control.Monad (forM)
|
||||
import Control.Applicative (liftA2)"
|
||||
'';
|
||||
});
|
||||
gi-gtk-hs =
|
||||
let drv = hsuper.gi-gtk-hs;
|
||||
in if final.lib.versionOlder drv.version "0.3.18"
|
||||
then fixGiVersionPackage drv
|
||||
else drv;
|
||||
# gi-gtk-hs patching is now handled by taffybar's fixVersionNamePackages overlay
|
||||
imalison-taffybar = prev.haskell.lib.addPkgconfigDepends (
|
||||
hself.callCabal2nix "imalison-taffybar"
|
||||
(
|
||||
|
||||
Reference in New Issue
Block a user