b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #191785 from usertam/patch/discord

Browse source 
discord: wrap executables to $out/bin for darwin
This commit is contained in:
Artturi 2022-09-20 06:14:36 +03:00 committed by GitHub
parent 9cca3b5829 c90ec7c598
commit 749458e780
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/networking/instant-messengers/discord/darwin.nix
View file

@ -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
'';

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View file

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