colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #284803 from wrmilling/armcord-makeBinaryWrapper

Browse Source 
armcord: makeWrapper -> makeBinaryWrapper
This commit is contained in:
Artturi 2024-01-29 19:47:06 +02:00 committed by GitHub
commit 1d2476c7d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
, fetchurl
, autoPatchelfHook
, dpkg
, makeWrapper
, makeBinaryWrapper
, wrapGAppsHook
, alsa-lib
, at-spi2-atk
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook ];
nativeBuildInputs = [ autoPatchelfHook dpkg makeBinaryWrapper wrapGAppsHook ];
dontWrapGApps = true;
@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
chmod -R g-w "$out"
# Wrap the startup command
makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \
makeBinaryWrapper $out/opt/ArmCord/armcord $out/bin/armcord \
"''${gappsWrapperArgs[@]}" \
--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 }}" \