diff options
| author | fortuneteller2k <lythe1107@gmail.com> | 2022-07-02 13:51:25 +0000 |
|---|---|---|
| committer | fortuneteller2k <lythe1107@gmail.com> | 2022-07-05 18:47:41 +0000 |
| commit | af7323d1a8ca96d2cd623e628407223c2fad92a2 (patch) | |
| tree | 2eff063817ffefb62fc1f9a8856ea026f4ce8ae1 /pkgs | |
| parent | 904cf8a5eea78141dc2287cdf9a149ae7656706e (diff) | |
| download | nixpkgs-af7323d1a8ca96d2cd623e628407223c2fad92a2.tar nixpkgs-af7323d1a8ca96d2cd623e628407223c2fad92a2.tar.gz nixpkgs-af7323d1a8ca96d2cd623e628407223c2fad92a2.tar.bz2 nixpkgs-af7323d1a8ca96d2cd623e628407223c2fad92a2.tar.lz nixpkgs-af7323d1a8ca96d2cd623e628407223c2fad92a2.tar.xz nixpkgs-af7323d1a8ca96d2cd623e628407223c2fad92a2.tar.zst nixpkgs-af7323d1a8ca96d2cd623e628407223c2fad92a2.zip | |
discord: fix override
Diffstat (limited to 'pkgs')
4 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index 368b4572aa6..aa1cfaa045c 100644 --- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -1,4 +1,4 @@ -{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, withOpenASAR }: +{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, withOpenASAR ? false }: stdenv.mkDerivation { inherit pname version src meta; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index f6e291ab7f3..87fad54f7bc 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,4 +1,4 @@ -{ branch ? "stable", callPackage, fetchurl, lib, stdenv, withOpenASAR ? false }: +{ branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { stable = "0.0.18"; @@ -67,7 +67,7 @@ let packages = (builtins.mapAttrs (_: value: callPackage package (value // { - inherit src version openasar withOpenASAR; + inherit src version openasar; meta = meta // { mainProgram = value.binaryName; }; }) ) diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index a68414978b0..846ac82d172 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -5,7 +5,7 @@ , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript -, common-updater-scripts, withOpenASAR }: +, common-updater-scripts, withOpenASAR ? false }: stdenv.mkDerivation rec { inherit pname version src meta; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93e016e13c4..7fe9ae9727e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35501,15 +35501,21 @@ with pkgs; mpvc = callPackage ../applications/misc/mpvc { }; - discord = callPackage ../applications/networking/instant-messengers/discord { + discord = import ../applications/networking/instant-messengers/discord { + inherit lib stdenv; + inherit (pkgs) callPackage fetchurl; branch = "stable"; }; - discord-ptb = callPackage ../applications/networking/instant-messengers/discord { + discord-ptb = import ../applications/networking/instant-messengers/discord { + inherit lib stdenv; + inherit (pkgs) callPackage fetchurl; branch = "ptb"; }; - discord-canary = callPackage ../applications/networking/instant-messengers/discord { + discord-canary = import ../applications/networking/instant-messengers/discord { + inherit lib stdenv; + inherit (pkgs) callPackage fetchurl; branch = "canary"; }; |