Merge pull request #191785 from usertam/patch/discord

discord: wrap executables to $out/bin for darwin
NixOS · Sep 20, 2022 · 749458e · 749458e
2 parents 9cca3b5 + c90ec7c
commit 749458e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
@@ -1,9 +1,9 @@
-{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, withOpenASAR ? false }:
+{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, withOpenASAR ? false }:
 
 stdenv.mkDerivation {
   inherit pname version src meta;
 
-  nativeBuildInputs = [ undmg ];
+  nativeBuildInputs = [ undmg makeWrapper ];
 
   sourceRoot = ".";
 
@@ -13,6 +13,10 @@ stdenv.mkDerivation {
     mkdir -p $out/Applications
     cp -r "${desktopName}.app" $out/Applications
 
+    # wrap executable to $out/bin
+    mkdir -p $out/bin
+    makeWrapper "$out/Applications/${desktopName}.app/Contents/MacOS/${binaryName}" "$out/bin/${binaryName}"
+
     runHook postInstall
   '';
 

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -80,12 +80,12 @@ let
         };
         ptb = rec {
           pname = "discord-ptb";
-          binaryName = "DiscordPTB";
+          binaryName = if stdenv.isLinux then "DiscordPTB" else desktopName;
           desktopName = "Discord PTB";
         };
         canary = rec {
           pname = "discord-canary";
-          binaryName = "DiscordCanary";
+          binaryName = if stdenv.isLinux then "DiscordCanary" else desktopName;
           desktopName = "Discord Canary";
         };
       }