Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

riot-desktop: use yarn2nix-moretea #67514

Closed
wants to merge 1 commit into from
Closed

riot-desktop: use yarn2nix-moretea #67514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web }:
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web, yarn2nix }:

# Note for maintainers:
# Versions of `riot-web` and `riot-desktop` should be kept in sync.

with (import ./yarn2nix.nix { inherit pkgs; });

let
executableName = "riot-desktop";
version = "1.3.3";
Expand All @@ -15,7 +13,7 @@ let
sha256 = "1nzzxcz4r9932cha80q1bzn1425m67fsl89pn7n7ybrv6y0jnxpc";
};

in mkYarnPackage rec {
in yarn2nix.mkYarnPackage rec {
name = "riot-desktop-${version}";
inherit version;

Expand Down
320 changes: 0 additions & 320 deletions pkgs/applications/networking/instant-messengers/riot/yarn2nix.nix
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1922,7 +1922,9 @@ in

ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { };

riot-desktop = callPackage ../applications/networking/instant-messengers/riot/riot-desktop.nix { };
riot-desktop = callPackage ../applications/networking/instant-messengers/riot/riot-desktop.nix {
yarn2nix = yarn2nix-moretea;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use yarn2nix-moretea directly.

};

riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix {
conf = config.riot-web.conf or null;
Expand Down