public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #109287 from TredwellGit/element-desktop

Browse Source
This commit is contained in:
Sandro 2021-01-13 19:05:18 +01:00 committed by GitHub
commit 3ef74a3565
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, makeWrapper, makeDesktopItem, mkYarnPackage , makeWrapper, makeDesktopItem, mkYarnPackage
, electron_9, element-web , electron, element-web
}: }:
# Notes for maintainers: # Notes for maintainers:
# * versions of `element-web` and `element-desktop` should be kept in sync. # * versions of `element-web` and `element-desktop` should be kept in sync.
@ -15,8 +15,6 @@ let
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-mdHsw1Vi+2hrAF7biX3pJqfRaZU2lpw9zUZdcCm717g="; sha256 = "sha256-mdHsw1Vi+2hrAF7biX3pJqfRaZU2lpw9zUZdcCm717g=";
}; };
electron = electron_9;
in mkYarnPackage rec { in mkYarnPackage rec {
name = "element-desktop-${version}"; name = "element-desktop-${version}";
inherit version src; inherit version src;
@ -57,7 +55,7 @@ in mkYarnPackage rec {
''; '';
# The desktop item properties should be kept in sync with data from upstream: # The desktop item properties should be kept in sync with data from upstream:
# https://github.com/vector-im/riot-desktop/blob/develop/package.json # https://github.com/vector-im/element-desktop/blob/develop/package.json
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "element-desktop"; name = "element-desktop";
exec = "${executableName} %u"; exec = "${executableName} %u";

8
pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh
View File

@ -4,12 +4,12 @@
set -euo pipefail set -euo pipefail
if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates the Yarn dependency lock files for the element-desktop package." echo "Regenerates the Yarn dependency lock files for the element-desktop package."
echo "Usage: $0 <git release tag>" echo "Usage: $0 <git release tag>"
exit 1 exit 1
fi fi
RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/riot-desktop/$1" RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/element-desktop/$1"
wget "$RIOT_WEB_SRC/package.json" -O element-desktop-package.json wget "$RIOT_WEB_SRC/package.json" -O element-desktop-package.json
wget "$RIOT_WEB_SRC/yarn.lock" -O element-desktop-yarndeps.lock wget "$RIOT_WEB_SRC/yarn.lock" -O element-desktop-yarndeps.lock