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/by-name/go | |
| parent | fc6e6b8ffb440710f291883c480e5b7f9c5dd6f9 (diff) | |
treewide: fix electron wrappers to use makeShellWrapper
Diffstat (limited to 'pkgs/by-name/go')
| -rw-r--r-- | pkgs/by-name/go/goofcord/package.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix index dda5986272d6a..d4103a09a08e8 100644 --- a/pkgs/by-name/go/goofcord/package.nix +++ b/pkgs/by-name/go/goofcord/package.nix @@ -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}}" \ |