nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch back to electron discord

This commit is contained in:
Nathan McCarty 2023-03-03 19:05:10 -05:00
parent f7d6d363f6
commit 354363233a
Signed by: thatonelutenist
GPG Key ID: D70DA3DD4D1E9F96
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.nix
View File

@ -214,22 +214,22 @@
# Special handling for discord, as it's unfree _and_ insecure! # Special handling for discord, as it's unfree _and_ insecure!
config = { config = {
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [ "electron-13.6.9" ]; permittedInsecurePackages = [ "electron-16.2.3" ];
}; };
}; };
in { in {
packages = flake-utils.lib.flattenTree { packages = flake-utils.lib.flattenTree {
discordWayland = pkgs.callPackage ./packages/discord/default.nix rec { discordWayland = pkgs.callPackage ./packages/discord/default.nix rec {
pname = "discord-electron"; pname = "discord-electron";
binaryName = "Discord"; binaryName = "DiscordCanary";
desktopName = "Discord (Wayland)"; desktopName = "Discord (Wayland)";
version = "0.0.22"; version = "0.0.148";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = url =
"https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
hash = "sha256-F1xzdx4Em6Ref7HTe9EH7whx49iFc0DFpaQKdFquq6c="; hash = "sha256-2ZrSDyPj3AHriCWZ/bb303H3J97TTun//WjmInNEmwk=";
}; };
electron = pkgs.electron_13; electron = pkgs.electron_22;
}; };
swayimg = pkgs.callPackage ./packages/swayimg/default.nix { }; swayimg = pkgs.callPackage ./packages/swayimg/default.nix { };
}; };

20
home-manager/linux/programs/communications.nix
View File

@ -54,13 +54,13 @@
terminal = false; terminal = false;
}; };
# Discord # Discord
discordItem = pkgs.makeDesktopItem { # discordItem = pkgs.makeDesktopItem {
name = "discord"; # name = "discord";
desktopName = "Discord (Chromium)"; # desktopName = "Discord (Chromium)";
exec = '' # exec = ''
${pkgs.chromium}/bin/chromium --enable-features=UseOzonePlatform -ozone-platform=wayland "--app=https://discord.com/app"''; # ${pkgs.chromium}/bin/chromium --enable-features=UseOzonePlatform -ozone-platform=wayland "--app=https://discord.com/app"'';
terminal = false; # terminal = false;
}; # };
# Messages # Messages
messagesItem = pkgs.makeDesktopItem { messagesItem = pkgs.makeDesktopItem {
name = "messages"; name = "messages";
@ -71,9 +71,9 @@
}; };
in [ in [
# Discord # Discord
# inputs.self.packages.${pkgs.system}.discordWayland inputs.self.packages.${pkgs.system}.discordWayland
# betterdiscordctl betterdiscordctl
discordItem # discordItem
# Desktop matrix client # Desktop matrix client
(enableWayland element-desktop "element-desktop") (enableWayland element-desktop "element-desktop")
# Desktop signal client # Desktop signal client