nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-25 21:44:49 +00:00
Code Issues 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 21:13:05 +10:00
parent ac667f26c1
commit 80969cc4ec
No known key found for this signature in database
GPG Key ID: D8B75C95FB4D1143
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1271,6 +1271,20 @@ self: super: {
# Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119 # Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119
jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk ./patches/jsaddle-webkit2gtk.patch; 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) # 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 # https://github.com/lehins/massiv/pull/104
massiv = dontCheck super.massiv; massiv = dontCheck super.massiv;

1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View File

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

1
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View File

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

3
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

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