diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-13 19:05:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-13 19:05:18 +0100 |
| commit | 3ef74a35656d03f380a84bd23555fe4bf5e340bd (patch) | |
| tree | 6f4992017ab9c754ce22ad30a91b6b175da6db83 /pkgs/applications | |
| parent | bed03ad07c1e253d79b1be8c5080fe73ef2e42be (diff) | |
| parent | 7016ae47d9554808804f7d8955744fbd6e48148b (diff) | |
| download | nixpkgs-3ef74a35656d03f380a84bd23555fe4bf5e340bd.tar nixpkgs-3ef74a35656d03f380a84bd23555fe4bf5e340bd.tar.gz nixpkgs-3ef74a35656d03f380a84bd23555fe4bf5e340bd.tar.bz2 nixpkgs-3ef74a35656d03f380a84bd23555fe4bf5e340bd.tar.lz nixpkgs-3ef74a35656d03f380a84bd23555fe4bf5e340bd.tar.xz nixpkgs-3ef74a35656d03f380a84bd23555fe4bf5e340bd.tar.zst nixpkgs-3ef74a35656d03f380a84bd23555fe4bf5e340bd.zip | |
Merge pull request #109287 from TredwellGit/element-desktop
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/element/element-desktop.nix | 6 | ||||
| -rwxr-xr-x | pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 1b2cd7d598a..cc5931f08ed 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , makeWrapper, makeDesktopItem, mkYarnPackage -, electron_9, element-web +, electron, element-web }: # Notes for maintainers: # * versions of `element-web` and `element-desktop` should be kept in sync. @@ -15,8 +15,6 @@ let rev = "v${version}"; sha256 = "sha256-mdHsw1Vi+2hrAF7biX3pJqfRaZU2lpw9zUZdcCm717g="; }; - electron = electron_9; - in mkYarnPackage rec { name = "element-desktop-${version}"; inherit version src; @@ -57,7 +55,7 @@ in mkYarnPackage rec { ''; # 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 { name = "element-desktop"; exec = "${executableName} %u"; diff --git a/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh b/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh index ecca3018e76..69d0d3d7072 100755 --- a/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh +++ b/pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh @@ -4,12 +4,12 @@ set -euo pipefail if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates the Yarn dependency lock files for the element-desktop package." - echo "Usage: $0 <git release tag>" - exit 1 + echo "Regenerates the Yarn dependency lock files for the element-desktop package." + echo "Usage: $0 <git release tag>" + exit 1 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/yarn.lock" -O element-desktop-yarndeps.lock |