From 44331791273ba9250d5511b2d2881ca642c1f645 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 24 Oct 2022 21:43:06 +0300 Subject: [PATCH] discord: make update script work for all branches --- .../networking/instant-messengers/discord/darwin.nix | 2 +- .../networking/instant-messengers/discord/default.nix | 2 +- .../networking/instant-messengers/discord/linux.nix | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index fc75da46a388..7b1c2b9be9f8 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, makeWrapper, withOpenASAR ? false }: +{ pname, version, src, openasar, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, branch, 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 3a2eae2a3fc4..4ede5a1a13d8 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -69,7 +69,7 @@ let (_: value: callPackage package (value // { - inherit src version openasar; + inherit src version openasar branch; 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 9ac36b66ff85..a6f0063efe4a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -5,6 +5,7 @@ , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand +, branch , common-updater-scripts, withOpenASAR ? false }: let @@ -141,7 +142,7 @@ stdenv.mkDerivation rec { }?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') version=''${url##https://dl*.discordapp.net/apps/linux/} version=''${version%%/*.tar.gz} - update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix + update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch} ''; }; }