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

riot-desktop: 1.3.0 -> 1.3.3

Browse Source
This commit is contained in:
pacien 2019-08-22 21:51:50 +02:00
parent b79ef23828
commit cdab5bd9e5
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web", "name": "riot-web",
"productName": "Riot", "productName": "Riot",
"main": "src/electron-main.js", "main": "src/electron-main.js",
"version": "1.3.0", "version": "1.3.3",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.", "author": "New Vector Ltd.",
"dependencies": { "dependencies": {

11
pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
View File

@ -1,4 +1,4 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron, riot-web }: { pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web }:
# Note for maintainers: # Note for maintainers:
# Versions of `riot-web` and `riot-desktop` should be kept in sync. # Versions of `riot-web` and `riot-desktop` should be kept in sync.
@ -7,12 +7,12 @@ with (import ./yarn2nix.nix { inherit pkgs; });
let let
executableName = "riot-desktop"; executableName = "riot-desktop";
version = "1.3.0"; version = "1.3.3";
riot-web-src = fetchFromGitHub { riot-web-src = fetchFromGitHub {
owner = "vector-im"; owner = "vector-im";
repo = "riot-web"; repo = "riot-web";
rev = "v${version}"; rev = "v${version}";
sha256 = "00142b0zcnwfdgvb84k2a0amyb67j3mm0d8p191aqk3bxv1xpxk1"; sha256 = "1nzzxcz4r9932cha80q1bzn1425m67fsl89pn7n7ybrv6y0jnxpc";
}; };
in mkYarnPackage rec { in mkYarnPackage rec {
@ -49,7 +49,7 @@ in mkYarnPackage rec {
ln -s "${desktopItem}/share/applications" "$out/share/applications" ln -s "${desktopItem}/share/applications" "$out/share/applications"
# executable wrapper # executable wrapper
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ makeWrapper '${electron_5}/bin/electron' "$out/bin/${executableName}" \
--add-flags "$out/share/riot/electron" --add-flags "$out/share/riot/electron"
''; '';
@ -82,7 +82,6 @@ in mkYarnPackage rec {
homepage = https://about.riot.im/; homepage = https://about.riot.im/;
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ pacien worldofpeace ]; maintainers = with maintainers; [ pacien worldofpeace ];
inherit (electron.meta) platforms; inherit (electron_5.meta) platforms;
}; };
} }