Mirror/nix-git
Mirror/nix-git
1
0
Fork 0
mirror of https://codeberg.org/privacy1st/nix-git synced 2024-11-22 22:09:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

signal-desktop on wayland

Browse Source
This commit is contained in:
Daniel Langbein 2023-12-20 17:54:57 +01:00
parent 3c376038a8
commit eb3becfaed
Signed by: langfingaz
GPG Key ID: 6C47C753F0823002
3 changed files with 14 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/autostart.nix
View File

@ -21,9 +21,9 @@
# target = ".config/autostart/" + pkgs.signal-desktop.pname + ".desktop"; # target = ".config/autostart/" + pkgs.signal-desktop.pname + ".desktop";
# source = (pkgs.signal-desktop + "/share/applications/" + pkgs.signal-desktop.pname + ".desktop"); # source = (pkgs.signal-desktop + "/share/applications/" + pkgs.signal-desktop.pname + ".desktop");
# }; # };
home.file."signal-desktop-beta" = lib.mkIf (osConfig.networking.hostName == "yodaTux") { home.file."signal-desktop" = lib.mkIf (osConfig.networking.hostName == "yodaTux") {
target = ".config/autostart/" + pkgs.signal-desktop-beta.pname + ".desktop"; target = ".config/autostart/" + pkgs.signal-desktop.pname + ".desktop";
source = (pkgs.signal-desktop-beta + "/share/applications/" + pkgs.signal-desktop-beta.pname + ".desktop"); source = (pkgs.signal-desktop + "/share/applications/" + pkgs.signal-desktop.pname + ".desktop");
}; };
home.file."thunderbird" = lib.mkIf (osConfig.networking.hostName == "yodaTux") { home.file."thunderbird" = lib.mkIf (osConfig.networking.hostName == "yodaTux") {

35
modules/signal-desktop.nix
View File

@ -2,41 +2,10 @@
{ {
users.users.yoda = { users.users.yoda = {
packages = with pkgs; [ packages = with pkgs; [
signal-desktop-beta # Signal client signal-desktop # Signal client
]; ];
}; };
# TODO: lib.mkIf (config.services.xserver.displayManager.gdm.wayland)
# TODO: Signal on Wayland without frequent crashes.
# Signal does also use the NIXOS_OZONE_WL variable to enable Wayland support. # Signal does also use the NIXOS_OZONE_WL variable to enable Wayland support.
# However, it does currently crash (very often) in this mode. environment.sessionVariables.NIXOS_OZONE_WL = lib.mkIf (config.services.xserver.displayManager.gdm.wayland) "1";
# See
# https://github.com/stelcodes/nixos-config/commit/79071d30912c5b6c2560654925bcc98533cf758f
# https://github.com/NixOS/nixpkgs/pull/222163
# https://github.com/NixOS/nixpkgs/issues/261101
# https://github.com/NixOS/nixpkgs/blob/898cb2064b6e98b8c5499f37e81adbdf2925f7c5/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix#L155
# Wayland support:
# Temporary fix until the above TODO is resolved.
#
# The following worked multiple times with signal-desktop-beta
# ... But sometimes it crashes on startup.
# signal-desktop-beta --use-tray-icon --enable-features=UseOzonePlatform --ozone-platform=wayland
#
# https://github.com/NixOS/nixpkgs/issues/222043#issuecomment-1493457041
nixpkgs.overlays = lib.mkIf (config.services.xserver.displayManager.gdm.wayland) [
(self: super: {
signal-desktop-beta = super.signal-desktop-beta.overrideAttrs (old: {
preFixup = old.preFixup + ''
gappsWrapperArgs+=(
--add-flags "--enable-features=UseOzonePlatform"
--add-flags "--ozone-platform=wayland"
)
'';
});
})
];
} }

18
nix/sources.json
View File

@ -5,10 +5,10 @@
"homepage": "https://nur.nix-community.org/", "homepage": "https://nur.nix-community.org/",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "b495f96757696e896c541c7a3a69ca03d44ddae7", "rev": "f133fc54e2a2495d19f6020120717240068ce0f3",
"sha256": "0jnp7cgpbx5xpc82bn649jr22yky14ql6xnpnl039rx2bmm3dn71", "sha256": "0yi30g9f2349gwl4s2v04q2ai11izbp7mjw63dzf7hvya330p2l1",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/NUR/archive/b495f96757696e896c541c7a3a69ca03d44ddae7.tar.gz", "url": "https://github.com/nix-community/NUR/archive/f133fc54e2a2495d19f6020120717240068ce0f3.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"home-manager": { "home-manager": {
@ -29,10 +29,10 @@
"homepage": null, "homepage": null,
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f", "rev": "d02ffbbe834b5599fc5f134e644e49397eb07188",
"sha256": "002wfdmxpspwb1cdcgznhx355vx5cdyn3p5471x9p3g32l2fnmkf", "sha256": "0dn7bimkzblqiwwdzldh33qfghvpqk6fmvlf0w0980m51gpczyiv",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/d02ffbbe834b5599fc5f134e644e49397eb07188.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"unstable": { "unstable": {
@ -41,10 +41,10 @@
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "886c9aee6ca9324e127f9c2c4e6f68c2641c8256", "rev": "7c33cd6bf01cf09f77bfdf6741cddfffa2cd5640",
"sha256": "04wxsx5a16zs1viqmnfqyzyglyingx3c6mwby7khsdsqh95frpm6", "sha256": "0j6yzzddb1q6zmky4qd01x7vfh7vg9rbqm22jnf7yd8gi7rnb7vv",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/886c9aee6ca9324e127f9c2c4e6f68c2641c8256.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/7c33cd6bf01cf09f77bfdf6741cddfffa2cd5640.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
} }
} }