cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #179906 from fortuneteller2k/discord-fix-override

Browse source 
discord: fix override
This commit is contained in:
Thiago Kenji Okada 2022-07-05 21:24:55 +01:00 committed by GitHub
commit 770e59d084
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

2
pkgs/applications/networking/instant-messengers/discord/linux.nix
View file

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

12
pkgs/top-level/all-packages.nix
View file

@ -35545,15 +35545,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";
};