diff options
author | Bobby Rong <rjl931189261@126.com> | 2024-02-26 15:49:35 +0000 |
---|---|---|
committer | Maxine Aubrey <max@ine.dev> | 2024-04-22 21:10:54 +0200 |
commit | 617e0ee76f983d8e49d0787ecafe8c02e01f43ab (patch) | |
tree | d0ef2266a960035c9187761609596cdb26f2d15e /nixos | |
parent | 9914081155b31f1c367d4bb2b8018772baabd39d (diff) |
gnome.gnome-remote-desktop: 45.1 → 46.0
https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/compare/45.1...46.0 In file included from ../src/grd-settings.c:28: /nix/store/xxx-freerdp-3.4.0/lib/pkgconfig/../../include/freerdp3/freerdp/freerdp.h:25:10: fatal error: winpr/stream.h: No such file or directory 25 | #include <winpr/stream.h> | ^~~~~~~~~~~~~~~~ compilation terminated. Ugh. So stuff I am aware of here: - In freerdp3.pc, winpr3 is in Requires.private. - In https://github.com/FreeRDP/FreeRDP/blob/3.4.0/include/freerdp/freerdp.h#L25 <winpr/stream.h> is included. - In GNOME/gnome-remote-desktop@d29909a <freerdp/freerdp.h> is included in src/grd-settings.c. - We patched pkg-config in NixOS to not include Requires.private in --cflags according to mate-desktop/atril issue 351. - According to https://gitlab.gnome.org/GNOME/gjs/-/issues/571, Requires.private is probably correct if no data types are exposed in public API. So to fix this somewhere, if src/grd-settings.c has direct usage of winpr, we can PR to g-r-d declaring the dep. If freerdp/freerdp.h exposes winpr data types we PR to freerdp and move winpr to Requires. Probably someone can help me do the check, I am committing this simply to unbreak the build for now. Changelog-Reviewed-By: Maxine Aubrey <max@ine.dev>
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix index b5573d2fc21bc..85b565e8c9e38 100644 --- a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix +++ b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix @@ -28,5 +28,6 @@ with lib; services.pipewire.enable = true; systemd.packages = [ pkgs.gnome.gnome-remote-desktop ]; + systemd.tmpfiles.packages = [ pkgs.gnome.gnome-remote-desktop ]; }; } |