Skip to content
/ nixpkgs Public
forked from NixOS/nixpkgs

Commit

Permalink
haskellPackages.taffybar: fix build
Browse files Browse the repository at this point in the history
Add patches to allow building with gi-gdkpixbuf_2_0_26

Upstream PRs:
 - taffybar/gtk-sni-tray#25
 - taffybar/taffybar#507
  • Loading branch information
rvl committed May 12, 2021
1 parent ac667f2 commit 80969cc
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
14 changes: 14 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1699,7 +1699,6 @@ broken-packages:
- gtk2hs-rpn
- gtk3-mac-integration
- gtkglext
- gtk-sni-tray
- gtksourceview2
- gtksourceview3
- gtk-toy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2886,7 +2886,6 @@ dont-distribute-packages:
- systemstats
- t3-client
- ta
- taffybar
- tagged-list
- tagged-th
- tagsoup-navigate
Expand Down
3 changes: 0 additions & 3 deletions pkgs/development/haskell-modules/hackage-packages.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 80969cc

Please sign in to comment.