public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskellPackages.taffybar: fix build

Browse Source 
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
This commit is contained in:
Rodney Lorrimar
2021-05-12 22:48:03 +10:00
parent ac667f26c1
commit 80969cc4ec
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-common.nix
+14
View File
@@ -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;