miku: Update Discord

This commit is contained in:
PapaTutuWawa 2021-10-21 23:42:36 +02:00
parent 90d44edbe1
commit 4cd367768b
2 changed files with 9 additions and 8 deletions

View File

@ -38,13 +38,13 @@ in mkHost config {
evdev-proxy # Custom package evdev-proxy # Custom package
vfio-isolate # Custom Package vfio-isolate # Custom Package
steam-wrapped steam-wrapped
discord-system-electron-wrapped # Custom package discord-wrapped # Custom package
superpaper # Custom package superpaper # Custom package
mumble mumble
piper piper
anime-dl trackma anime-dl trackma # Custom package
unstable.thunderbird unstable.thunderbird
multimc-wrapped multimc-wrapped # Custom package
]; ];
extraOptions = old: { extraOptions = old: {
programs = { programs = {
@ -56,6 +56,7 @@ in mkHost config {
extraModprobeConfig = '' extraModprobeConfig = ''
options kvm_amd nested=1 options kvm_amd nested=1
options vfio-pci ids=1002:67df,1002:aaf0 options vfio-pci ids=1002:67df,1002:aaf0
options amdgpu dpm=0
''; '';
initrd = { initrd = {
availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" "amdgpu" "vendor-reset" ]; availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" "amdgpu" "vendor-reset" ];
@ -107,7 +108,7 @@ in mkHost config {
}; };
}; };
}; };
# TODO: Move into modules # TODO: Move into modules
systemd.user.services = { systemd.user.services = {
scream = { scream = {

View File

@ -1,16 +1,16 @@
{ {
lib, stdenv, pkgs lib, stdenv, pkgs
, makeDesktopItem
, extraStartupArgs ? "" , extraStartupArgs ? ""
}: }:
pkgs.discord.overrideAttrs (old: let pkgs.unstable.discord.overrideAttrs (old: let
asar = pkgs.nodePackages.asar; asar = pkgs.nodePackages.asar;
gtk3 = pkgs.gtk3; gtk3 = pkgs.gtk3;
binaryName = "Discord"; binaryName = "Discord";
system-electron = "$out/opt/${binaryName}/system-electron.sh"; system-electron = "$out/opt/${binaryName}/system-electron.sh";
in rec { in rec {
nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ electron asar ]; version = "0.0.16";
nativeBuildInputs = with pkgs.unstable; old.nativeBuildInputs ++ [ electron asar ];
buildPhase = '' buildPhase = ''
${asar}/bin/asar e resources/app.asar resources/app ${asar}/bin/asar e resources/app.asar resources/app
rm resources/app.asar rm resources/app.asar