Compare commits

..

2 commits

Author SHA1 Message Date
Natsu Kagami 5a9dbf660b
Update nixpkgs and nixos-m1 2023-06-26 08:51:10 +02:00
Natsu Kagami 9c616cd6c1
Force x11 armcord 2023-06-26 08:36:17 +02:00
2 changed files with 18 additions and 17 deletions

View file

@ -367,11 +367,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1686889638, "lastModified": 1687745434,
"narHash": "sha256-fmMniETOJoDolXiGJP8NnwZ/rCNftFYjech7E1Yonsw=", "narHash": "sha256-k0Xr/Ur4mMwS4fbG0NVkD6ILyKULCbL4AxerNKZc4PQ=",
"owner": "tpwrules", "owner": "tpwrules",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "002d7e27b1de5885b14c2b2ed3be13c9ad862d23", "rev": "fd3d8bf86897666317b89a0846e4817442761221",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -446,11 +446,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1686921029, "lastModified": 1687555006,
"narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", "narHash": "sha256-GD2Kqb/DXQBRJcHqkM2qFZqbVenyO7Co/80JHRMg2U0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", "rev": "33223d479ffde3d05ac16c6dff04ae43cc27e577",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,17 +1,18 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, ... }:
let let
discord = pkgs.armcord.overrideAttrs (attrs: { discord =
postInstall = '' (pkgs.armcord.override { nss = pkgs.nss_latest; }).overrideAttrs (attrs: {
# Wrap the startup command postInstall = ''
makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \ # Wrap the startup command
"''${gappsWrapperArgs[@]}" \ makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \
--prefix XDG_DATA_DIRS : "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}/" \ "''${gappsWrapperArgs[@]}" \
--add-flags "--ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WebRTCPipeWireCapturer" \ --prefix XDG_DATA_DIRS : "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}/" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath attrs.buildInputs}" \ --add-flags "--ozone-platform=x11 --enable-features=UseOzonePlatform --enable-features=WebRTCPipeWireCapturer" \
--suffix PATH : ${lib.makeBinPath [ pkgs.xdg-utils ]} --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath attrs.buildInputs}" \
''; --suffix PATH : ${lib.makeBinPath [ pkgs.xdg-utils ]}
}); '';
});
in in
{ {
imports = [ imports = [