dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

armcord: wayland screen sharing support

Browse Source 
removed duplicite "''${gappsWrapperArgs[@]}"
This commit is contained in:
dev-null-undefined 2023-01-31 04:58:52 +01:00 committed by pennae
parent 42b3a6354f
commit 489843eab7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/instant-messengers/armcord/default.nix
View File

@ -33,6 +33,8 @@
, systemd , systemd
, xdg-utils , xdg-utils
, xorg , xorg
, wayland
, pipewire
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -97,6 +99,8 @@ stdenv.mkDerivation rec {
xorg.libXScrnSaver xorg.libXScrnSaver
xorg.libxshmfence xorg.libxshmfence
xorg.libXtst xorg.libXtst
wayland
pipewire
]; ];
sourceRoot = "."; sourceRoot = ".";
@ -114,9 +118,9 @@ stdenv.mkDerivation rec {
makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \ makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \
"''${gappsWrapperArgs[@]}" \ "''${gappsWrapperArgs[@]}" \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WebRTCPipeWireCapturer }}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
"''${gappsWrapperArgs[@]}"
# Fix desktop link # Fix desktop link
substituteInPlace $out/share/applications/armcord.desktop \ substituteInPlace $out/share/applications/armcord.desktop \