diff options
| author | pacien <pacien.trangirard@pacien.net> | 2019-03-30 23:57:59 +0100 |
|---|---|---|
| committer | pacien <pacien.trangirard@pacien.net> | 2019-03-30 23:57:59 +0100 |
| commit | 54d99ab3e402507f0455edc460a63e8d95237105 (patch) | |
| tree | 482dfe279e6d4a2be2de008868a31fa359f03064 /pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix | |
| parent | 839c988dd0f7899e008c75ea21176254b305adeb (diff) | |
| download | nixlib-54d99ab3e402507f0455edc460a63e8d95237105.tar nixlib-54d99ab3e402507f0455edc460a63e8d95237105.tar.gz nixlib-54d99ab3e402507f0455edc460a63e8d95237105.tar.bz2 nixlib-54d99ab3e402507f0455edc460a63e8d95237105.tar.lz nixlib-54d99ab3e402507f0455edc460a63e8d95237105.tar.xz nixlib-54d99ab3e402507f0455edc460a63e8d95237105.tar.zst nixlib-54d99ab3e402507f0455edc460a63e8d95237105.zip | |
riot-desktop: use own yarn2nix
github ref: closes #58593
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 03f1cc2471e9..0d10d1ae8be2 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, yarn2nix, makeWrapper, makeDesktopItem, electron, riot-web }: +{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron, riot-web }: + +with (import ./yarn2nix.nix { inherit pkgs; }); let executableName = "riot-desktop"; @@ -10,7 +12,7 @@ let sha256 = "152mi81miams5a7l9rd12bnf6wkd1r0lyicgr35r5fq0p6z7a4dk"; }; -in yarn2nix.mkYarnPackage rec { +in mkYarnPackage rec { name = "riot-desktop-${version}"; inherit version; @@ -48,6 +50,12 @@ in yarn2nix.mkYarnPackage rec { --add-flags "$out/share/riot/electron" ''; + # Do not attempt generating a tarball for riot-web again. + # note: `doDist = false;` does not work. + distPhase = '' + true + ''; + # The desktop item properties should be kept in sync with data from upstream: # * productName and description from # https://github.com/vector-im/riot-web/blob/develop/electron_app/package.json |