diff options
| author | Naïm Favier <n@monade.li> | 2022-05-10 16:01:59 +0200 |
|---|---|---|
| committer | Naïm Favier <n@monade.li> | 2022-05-10 22:07:56 +0200 |
| commit | 62245943aa12a06cc976ca94c632d70049316415 (patch) | |
| tree | dbade7f687367eddd17e46f94caafb44a3e889b0 /pkgs/applications/networking/instant-messengers/discord/linux.nix | |
| parent | 0d6bcb513bf2f2fe92ff8b2fae75da95007a03e3 (diff) | |
makeWrapper,makeBinaryWrapper: introduce explicitly named functions
Because both versions might end up in a derivation's build inputs, it
might be useful to be able to explicitly select which function to use.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/discord/linux.nix')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/discord/linux.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index f5d984bf3a67..b36dc935f1ce 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { libxshmfence mesa nss - (wrapGAppsHook.override { makeBinaryWrapper = makeWrapper; }) + wrapGAppsHook + makeWrapper ]; dontWrapGApps = true; @@ -78,7 +79,7 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ $out/opt/${binaryName}/${binaryName} - wrapProgram $out/opt/${binaryName}/${binaryName} \ + wrapProgramShell $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ |