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

riot-desktop: 1.5.10 -> 1.5.12

Browse Source
This commit is contained in:
pacien 2020-03-05 23:16:31 +01:00 committed by Jon
parent 18848216ea
commit abc58dc1d0
2 changed files with 7 additions and 6 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.5.10", "version": "1.5.12",
"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_5, riot-web, mkYarnPackage }: { pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_7, riot-web, mkYarnPackage }:
# Notes for maintainers: # Notes 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.
@ -6,13 +6,14 @@
let let
executableName = "riot-desktop"; executableName = "riot-desktop";
version = "1.5.10"; version = "1.5.12";
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 = "0yr5f3i24qh9b8hjfalpqxwr0qhs7hax450g83vf06skap1l5i5j"; sha256 = "1qz3n2dlklhbi6rbhv2v769xbr4rcp9s6pm2cc9r33ak6axn4aym";
}; };
electron = electron_7;
in mkYarnPackage rec { in mkYarnPackage rec {
name = "riot-desktop-${version}"; name = "riot-desktop-${version}";
@ -45,7 +46,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_5}/bin/electron' "$out/bin/${executableName}" \ makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
--add-flags "$out/share/riot/electron" --add-flags "$out/share/riot/electron"
''; '';
@ -78,6 +79,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_5.meta) platforms; inherit (electron.meta) platforms;
}; };
} }