swaynotificationcenter: push cross fix upstream

This commit is contained in:
Colin 2024-02-27 11:59:36 +00:00
parent be5fae369f
commit b1e943c9bb
2 changed files with 5 additions and 11 deletions

View File

@ -26,6 +26,11 @@ let
// (if title != null then { name = title; } else {})
) else null;
in [
(fetchpatch' {
prUrl = "https://github.com/NixOS/nixpkgs/pull/291806";
title = "swaynotificationcenter: support cross compilation";
hash = "sha256-Od5591zj8OW2WncI4eY9i5i8cFsAM7NQtHyYB9KSpLg=";
})
(fetchpatch' {
saneCommit = "20c9492d303be7cbad560e3d83bc47ab4b1e93f7";
title = "procmail: support cross compilation";

View File

@ -2101,17 +2101,6 @@ in with final; {
# ;
# };
# 2023/12/08: upstreaming is unblocked
swaynotificationcenter = prev.swaynotificationcenter.overrideAttrs (upstream: {
mesonFlags = (upstream.mesonFlags or []) ++ [
# fixes "[can't find scdoc]"
# could instead add pkg-config to depsBuildBuild, but then the build tries to link against native deps and fails elsewhere
"-Dman-pages=false"
];
# fixes: "Run-time dependency granite found: NO (tried pkgconfig)"
buildInputs = upstream.buildInputs ++ [ pantheon.granite ];
});
# 2023/12/08: upstreaming is blocked by qtsvg (via pipewire)
tangram = prev.tangram.overrideAttrs (upstream: {
# blueprint-compiler runs on the build machine, but tries to load gobject-introspection types meant for the host.