Unverified Commit 34666299 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #316961 from eclairevoyant/electron-wrapper-fix

parents 335550d2 c05c203d

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

+5 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
, fetchurl

, autoPatchelfHook

, dpkg

, makeBinaryWrapper

, makeShellWrapper

, wrapGAppsHook3

, 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 makeBinaryWrapper wrapGAppsHook3 ];

  nativeBuildInputs = [ autoPatchelfHook dpkg makeShellWrapper wrapGAppsHook3 ];



  dontWrapGApps = true;
@@ -113,8 +113,9 @@ stdenv.mkDerivation rec { 
    cp -R "usr/share" "$out/share"

    chmod -R g-w "$out"



    # Wrap the startup command

    makeBinaryWrapper $out/opt/ArmCord/armcord $out/bin/armcord \

    # use makeShellWrapper (instead of the makeBinaryWrapper provided by wrapGAppsHook3) for proper shell variable expansion

    # see https://github.com/NixOS/nixpkgs/issues/172583

    makeShellWrapper $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 }}" \

pkgs/by-name/go/goofcord/package.nix

+5 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  fetchurl,

  autoPatchelfHook,

  dpkg,

  makeBinaryWrapper,

  makeShellWrapper,

  wrapGAppsHook3,

  alsa-lib,

  at-spi2-atk,
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeBuildInputs = [

    autoPatchelfHook

    dpkg

    makeBinaryWrapper

    makeShellWrapper

    wrapGAppsHook3

  ];
@@ -120,8 +120,9 @@ stdenv.mkDerivation (finalAttrs: { 
    cp -R "usr/share" "$out/share"

    chmod -R g-w "$out"



    # Wrap the startup command

    makeBinaryWrapper $out/opt/GoofCord/goofcord $out/bin/goofcord \

    # use makeShellWrapper (instead of the makeBinaryWrapper provided by wrapGAppsHook3) for proper shell variable expansion

    # see https://github.com/NixOS/nixpkgs/issues/172583

    makeShellWrapper $out/opt/GoofCord/goofcord $out/bin/goofcord \

      "''${gappsWrapperArgs[@]}" \

      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \

      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer}}" \