From 9c616cd6c19aa8a8340c459d4f90ea01de12488a Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Mon, 26 Jun 2023 08:36:09 +0200 Subject: [PATCH] Force x11 armcord --- home/macbook-nixos.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/home/macbook-nixos.nix b/home/macbook-nixos.nix index 88f1807..09802d1 100644 --- a/home/macbook-nixos.nix +++ b/home/macbook-nixos.nix @@ -1,17 +1,18 @@ { pkgs, config, lib, ... }: let - discord = pkgs.armcord.overrideAttrs (attrs: { - postInstall = '' - # Wrap the startup command - makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \ - "''${gappsWrapperArgs[@]}" \ - --prefix XDG_DATA_DIRS : "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}/" \ - --add-flags "--ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WebRTCPipeWireCapturer" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath attrs.buildInputs}" \ - --suffix PATH : ${lib.makeBinPath [ pkgs.xdg-utils ]} - ''; - }); + discord = + (pkgs.armcord.override { nss = pkgs.nss_latest; }).overrideAttrs (attrs: { + postInstall = '' + # Wrap the startup command + makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \ + "''${gappsWrapperArgs[@]}" \ + --prefix XDG_DATA_DIRS : "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}/" \ + --add-flags "--ozone-platform=x11 --enable-features=UseOzonePlatform --enable-features=WebRTCPipeWireCapturer" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath attrs.buildInputs}" \ + --suffix PATH : ${lib.makeBinPath [ pkgs.xdg-utils ]} + ''; + }); in { imports = [