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

gnome-calls: 47.beta -> 47.0

Browse Source
This commit is contained in:
Colin
2024-12-08 05:19:58 +00:00
parent f672823214
commit 65a1caf206
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
hosts/common/programs/calls.nix
View File

@@ -42,16 +42,12 @@ in
}; };
packageUnwrapped = pkgs.rmDbusServicesInPlace ((pkgs.calls.override { packageUnwrapped = pkgs.rmDbusServicesInPlace ((pkgs.calls.override {
# 46.3 -> 47.xx upgraded gtk3 -> gtk4; nixpkgs package is outdated, so substitute gtk3 deps with gtk4 deps
evolution-data-server = pkgs.evolution-data-server-gtk4.override { evolution-data-server = pkgs.evolution-data-server-gtk4.override {
# drop webkitgtk_6_0 dependency. # drop webkitgtk_6_0 dependency.
# it's normally cached, but if modifying low-level deps (e.g. pipewire) it's nice to not have to rebuild it, # it's normally cached, but if modifying low-level deps (e.g. pipewire) it's nice to not have to rebuild it,
# especially since `calls` is part of `moby-min`. # especially since `calls` is part of `moby-min`.
withGtk4 = false; withGtk4 = false;
}; };
gtk3 = pkgs.gtk4;
libpeas = pkgs.libpeas2;
wrapGAppsHook3 = pkgs.wrapGAppsHook4;
sofia_sip = pkgs.sofia_sip.overrideAttrs (upstream: { sofia_sip = pkgs.sofia_sip.overrideAttrs (upstream: {
# use linphone's sofia_sip. # use linphone's sofia_sip.
# Freeswitch sofia_sip has a bug where a failed DNS query will never return to the caller. # Freeswitch sofia_sip has a bug where a failed DNS query will never return to the caller.
@@ -66,24 +62,29 @@ in
}; };
}); });
}).overrideAttrs (upstream: { }).overrideAttrs (upstream: {
# XXX(2024-08-08): v46.3 has a bug where if it has no network connection on launch, it forever stays disconnected & never retries # src = lib.warnIf (lib.versionOlder "47.0" upstream.version) "gnome-calls outdated; remove src override? (keep UI patches though!)" pkgs.fetchFromGitLab {
version = "47_beta.0-unstable-2024-08-08"; # domain = "gitlab.gnome.org";
src = lib.warnIf (lib.versionOlder "47.0" upstream.version) "gnome-calls outdated; remove src override? (keep UI patches though!)" pkgs.fetchFromGitLab { # owner = "GNOME";
domain = "gitlab.gnome.org"; # repo = "calls";
owner = "GNOME"; # fetchSubmodules = true;
repo = "calls"; # # rev = "main";
fetchSubmodules = true; # # rev = "ff213579a52222e7c95e585843d97b5b817b2a8b";
# rev = "main"; # # hash = "sha256-0QYC8FJpfg/X2lIjBDooba2idUfpJNQhcpv8Z5I/B4k=";
rev = "ff213579a52222e7c95e585843d97b5b817b2a8b"; # rev = "75c4072c4e2ba8619c8067703fb65fe622af8b42";
hash = "sha256-0QYC8FJpfg/X2lIjBDooba2idUfpJNQhcpv8Z5I/B4k="; # hash = "sha256-99B1GS2IXt3per8XnbBRCTChlcwT3zWnhwgG1ift0QQ=";
}; # };
patches = (upstream.patches or []) ++ [ patches = (upstream.patches or []) ++ [
(pkgs.fetchpatch { (pkgs.fetchpatch {
# usability improvement... ties the UI visibility to the connection state, so if the UI is gone, then i can't receive calls (and will hopefully notice that more easily!) # usability improvement... ties the UI visibility to the connection state, so if the UI is gone, then i can't receive calls (and will hopefully notice that more easily!)
url = "https://git.uninsane.org/colin/gnome-calls/commit/a19166d85927e59662fae189a780eed18bf876ce.patch"; # TODO: see about a more maintainable solution:
# 1. create gobject-introspection bindings, then a python wrapper which binds the MainWindow and CallWindow notify::visible signals?
# 2. move this functionality into a gnome calls `plugin`?
# 3. upstream this; use the Nautilus approach of controlling behavior here with an env var?
# also TODO: write a nix test for this functionality so that it doesn't break during an upgrade!
url = "https://git.uninsane.org/colin/gnome-calls/commit/88dbe108a8cf82f9c0766c310218902a8a2a7cd5.patch";
name = "exit on close (i.e. never daemonize)"; name = "exit on close (i.e. never daemonize)";
hash = "sha256-NoVQV2TlkCcsBt0uwSyK82hBKySUW4pADrJVfLFvWgU="; hash = "sha256-QggVM28X9A2f9SbHMMM38M4zKhjYZrTvsZoitxyczdo=";
}) })
(pkgs.fetchpatch { (pkgs.fetchpatch {
# solves the issue where flakey DNS (especially at boot) could take down call connectivity indefinitely. # solves the issue where flakey DNS (especially at boot) could take down call connectivity indefinitely.
@@ -93,14 +94,6 @@ in
hash = "sha256-agPM3XKXiP5Rxrl26DNA+pnhEPTBEBQBxZe3CoptgII="; hash = "sha256-agPM3XKXiP5Rxrl26DNA+pnhEPTBEBQBxZe3CoptgII=";
}) })
]; ];
nativeBuildInputs = upstream.nativeBuildInputs ++ [
pkgs.dbus #< for dbus-run-session (should be test only, but it's not)
];
buildInputs = upstream.buildInputs ++ [
pkgs.libadwaita
];
})); }));
sandbox.net = "vpn.wg-home"; #< XXX(2024/07/05): my cell carrier seems to block RTP, so tunnel it. sandbox.net = "vpn.wg-home"; #< XXX(2024/07/05): my cell carrier seems to block RTP, so tunnel it.

7
pkgs/by-name/nixpkgs-bootstrap/patches.nix
View File

@@ -65,6 +65,13 @@ in
# hash = "sha256-Gki/GZOyFcWQRfChouIEZMmg2GDdAtsUSyAbSbTqANc="; # hash = "sha256-Gki/GZOyFcWQRfChouIEZMmg2GDdAtsUSyAbSbTqANc=";
# }) # })
(fetchpatch' {
# TODO: send upstream (branch: pr-calls-47)
name = "calls: 46.3 -> 47.0";
saneCommit = "17349a94e6e7d196ae6301603d791f69f14a8a4c";
hash = "sha256-qL9fqzOtmwOaDUK/lBKTQNs2mjdY1xFALgUxMZVcFGM=";
})
(fetchpatch' { (fetchpatch' {
name = "apacheHttpdPackages.mod_dnssd: fix cross compilation"; name = "apacheHttpdPackages.mod_dnssd: fix cross compilation";
prUrl = "https://github.com/NixOS/nixpkgs/pull/362066"; prUrl = "https://github.com/NixOS/nixpkgs/pull/362066";