haskellPackages.taffybar: fix build

Add patches to allow building with gi-gdkpixbuf_2_0_26

Upstream PRs:
 - https://github.com/taffybar/gtk-sni-tray/pull/25
 - https://github.com/taffybar/taffybar/pull/507
wip/little-gl
Rodney Lorrimar 3 years ago
parent ac667f26c1
commit 80969cc4ec
No known key found for this signature in database
GPG Key ID: D8B75C95FB4D1143
  1. 14
      pkgs/development/haskell-modules/configuration-common.nix
  2. 1
      pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
  3. 1
      pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
  4. 3
      pkgs/development/haskell-modules/hackage-packages.nix

@ -1271,6 +1271,20 @@ self: super: {
# Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119
jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk ./patches/jsaddle-webkit2gtk.patch;
# 2021-05-12: gi-gdkpixbuf_2_0_26 fix
# https://github.com/taffybar/gtk-sni-tray/pull/25
gtk-sni-tray = appendPatch super.gtk-sni-tray (pkgs.fetchpatch {
url = "https://github.com/taffybar/gtk-sni-tray/pull/25/commits/4afd84654cb3f2bd2bb7d39451706c5914fd3cdf.patch";
sha256 = "1xjxlh58vnykqsjq4qw8mliq3gk17mwxi4h9z8dvjyav8zqg05rn";
});
# 2021-05-12: gi-gdkpixbuf_2_0_26 fix
# https://github.com/taffybar/taffybar/pull/507
taffybar = appendPatch super.taffybar (pkgs.fetchpatch {
url = "https://github.com/taffybar/taffybar/pull/507/commits/14a650d0954000cbd2cb1018a2f3bcd40ecb564f.patch";
sha256 = "01rm8zida5858j5r0mw7bpmv24b03mb3rw34lbkaw3i7g62bx3a0";
});
# Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
# https://github.com/lehins/massiv/pull/104
massiv = dontCheck super.massiv;

@ -1699,7 +1699,6 @@ broken-packages:
- gtk2hs-rpn
- gtk3-mac-integration
- gtkglext
- gtk-sni-tray
- gtksourceview2
- gtksourceview3
- gtk-toy

@ -2886,7 +2886,6 @@ dont-distribute-packages:
- systemstats
- t3-client
- ta
- taffybar
- tagged-list
- tagged-th
- tagsoup-navigate

@ -111794,8 +111794,6 @@ self: {
platforms = [
"aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
];
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) gtk3;};
"gtk-strut" = callPackage
@ -252598,7 +252596,6 @@ self: {
platforms = [
"aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
];
hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) gtk3;};
"tag-bits" = callPackage

Loading…
Cancel
Save