diff options
| author | éclairevoyant <848000+eclairevoyant@users.noreply.github.com> | 2024-06-03 12:35:54 -0400 |
|---|---|---|
| committer | éclairevoyant <848000+eclairevoyant@users.noreply.github.com> | 2024-06-04 13:57:59 -0400 |
| commit | c05c203df716f444fa075e121bb9cf362b694db0 (patch) | |
| tree | 0124aefaa7041de38a39be9e11faee8ccb4e2cfc /pkgs/applications/networking/instant-messengers/armcord | |
| parent | fc6e6b8ffb440710f291883c480e5b7f9c5dd6f9 (diff) | |
treewide: fix electron wrappers to use makeShellWrapper
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/armcord')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/armcord/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index d3644e1d27ee8..f7336df2612f1 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -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 }}" \ |