Unverified Commit 1d2476c7 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #284803 from wrmilling/armcord-makeBinaryWrapper 

armcord: makeWrapper -> makeBinaryWrapper
parents fa11d313 45e6764d

pkgs/applications/networking/instant-messengers/armcord/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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 }}" \