colin
/
nix-files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cross: libshumate: push patch upstream

This commit is contained in:
Colin 2024-02-27 23:58:49 +00:00
parent 6b2d189771
commit 466e7a9ecd
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixpatches/list.nix
View File

@ -44,6 +44,11 @@ in [
title = "imagemagick, graphicsmagick: remove build coreutils from cross-compiled output";
hash = "sha256-jUtMmT4d+/6hZgrpXhfBcToAfdecl7xtEj1d/ofxaIM=";
})
(fetchpatch' {
prUrl = "https://github.com/NixOS/nixpkgs/pull/291947";
title = "libshumate: support cross compilation";
hash = "sha256-l1EXoggqgcmAlKdq501x2hBjqaGJrG4hO/xSnSWDt3U=";
})
# (fetchpatch' {
# title = "nixos/slskd: allow omitting username from yaml config";

14
overlays/cross.nix
View File

@ -1195,14 +1195,14 @@ in with final; {
# callPackage = self.newScope { inherit (self) qtCompatVersion qtModule srcs; inherit stdenv; };
# });
# 2024/02/27: upstreaming is unblocked
# 2024/02/27: upstreaming is unblocked, out for PR: <https://github.com/NixOS/nixpkgs/pull/291947>
# but i don't think either the pkg-config fix (which breaks binfmt cross) nor disabling docs is the right fix.
libshumate = prev.libshumate.overrideAttrs (upstream: {
# fixes "Build-time dependency gi-docgen found: NO (tried pkgconfig and cmake)"
mesonFlags = (upstream.mesonFlags or []) ++ [ "-Dgtk_doc=false" ];
# alternative partial fix, but then it tries to link against the build glib
# depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ pkg-config ];
});
# libshumate = prev.libshumate.overrideAttrs (upstream: {
# # fixes "Build-time dependency gi-docgen found: NO (tried pkgconfig and cmake)"
# mesonFlags = (upstream.mesonFlags or []) ++ [ "-Dgtk_doc=false" ];
# # alternative partial fix, but then it tries to link against the build glib
# # depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ pkg-config ];
# });
# 2023/12/19: upstreaming blocked on glycin-loaders
loupe = prev.loupe.overrideAttrs (upstream: