ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 05:37:27 +03:00
Code Issues Projects Releases Wiki Activity

treewide: fix electron wrappers to use makeShellWrapper

Browse Source
This commit is contained in:
éclairevoyant 2024-06-03 12:35:54 -04:00
parent fc6e6b8ffb
commit c05c203df7
No known key found for this signature in database
GPG Key ID: E3813AEAA02DB54B
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 }}" \

9
pkgs/by-name/go/goofcord/package.nix
View File

@ -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}}" \