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

fix warnings: remove xdg-desktop-portal patch; fix mautrix-meta enable logic

Browse Source
This commit is contained in:
Colin
2024-04-05 21:40:42 +00:00
parent 38c8d96e5a
commit 4b3975367a
2 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
hosts/common/programs/xdg-desktop-portal.nix
View File

@@ -26,31 +26,7 @@ in
sane.programs.xdg-desktop-portal = { sane.programs.xdg-desktop-portal = {
# rmDbusServices: because we care about ordering with the rest of the desktop, and don't want something else to auto-start this. # rmDbusServices: because we care about ordering with the rest of the desktop, and don't want something else to auto-start this.
packageUnwrapped = pkgs.rmDbusServicesInPlace ( packageUnwrapped = pkgs.rmDbusServicesInPlace (
(pkgs.xdg-desktop-portal.overrideAttrs (upstream: let pkgs.xdg-desktop-portal.overrideAttrs (upstream: {
useOwnSrc = upstream.version == "1.18.2";
in lib.warnIf (!useOwnSrc) "xdg-desktop-portal package pin is outdated" lib.optionalAttrs useOwnSrc {
# use a nightly version to fix a crash observced with moby + mpv + alsa
# fixed presumably by 1e15771665c8a9c3645d101c749e192ada95ab2c
# GLib-GObject-CRITICAL **: 06:09:34.061: g_object_ref: assertion '!object_already_finalized' failed
# active task has backtrace: close_requests_in_thread_func -> g_mutex_lock -> __aarch64_cas4_acq_rel
version = "1.18.2-unstable-2024-03-11";
src = pkgs.fetchFromGitHub {
owner = "flatpak";
repo = "xdg-desktop-portal";
rev = "9423046dfa0a1488ce069f377c26a70034bb42b9";
hash = "sha256-VGCJ1CyxaDyg2X3Pcnf+83ZXEiQpAqFvkvjoxd678t4=";
};
mesonFlags = upstream.mesonFlags ++ [
"-Ddocumentation=disabled" # post 2023-11-19, docs require Sphinx, which i don't understand
];
nativeBuildInputs = upstream.nativeBuildInputs ++ [
pkgs.buildPackages.python3
];
postPatch = (upstream.postPatch or "") + ''
patchShebangs --build src/generate-method-info.py
'';
})).overrideAttrs (upstream: {
postPatch = (upstream.postPatch or "") + '' postPatch = (upstream.postPatch or "") + ''
# wherever we have a default mime association, don't prompt the user to choose an app. # wherever we have a default mime association, don't prompt the user to choose an app.
# tracking issues about exposing this formally: # tracking issues about exposing this formally:

7
nixpatches/list.nix
View File

@@ -32,6 +32,13 @@ in [
# etc, where "date" is like "20240228181608" # etc, where "date" is like "20240228181608"
# and can be found with `nix-repl > :lf . > lastModifiedDate` # and can be found with `nix-repl > :lf . > lastModifiedDate`
(fetchpatch' {
prUrl = "https://github.com/NixOS/nixpkgs/pull/301919";
saneCommit = "5468e6802aa060dee755b0019a612f605270d90d";
title = "nixos/mautrix-meta: fix lax enable check";
hash = "sha256-e5Yf/HzP0tfY6fuo6A8XrYvAwZOrQCIfRqPBcX+Tfg4=";
})
(fetchpatch' { (fetchpatch' {
prUrl = "https://github.com/NixOS/nixpkgs/pull/298001"; prUrl = "https://github.com/NixOS/nixpkgs/pull/298001";
saneCommit = "d599839060400762a67d2c01d15b102ffe75e703"; saneCommit = "d599839060400762a67d2c01d15b102ffe75e703";