diff options
| author | Milan Pässler <mil@nyantec.com> | 2019-10-20 22:32:31 +0200 |
|---|---|---|
| committer | Lassulus <github@lassul.us> | 2019-11-24 01:04:26 +0100 |
| commit | 7e0127e1ca6f3e2bd56a52946745e4bfb2485028 (patch) | |
| tree | a098c918d0e7a045750bbc9db2f0a727062500dc /pkgs/applications/networking/instant-messengers/riot | |
| parent | 9ab168b500e8888184975d47284fe3114da0e1b9 (diff) | |
| download | nixpkgs-7e0127e1ca6f3e2bd56a52946745e4bfb2485028.tar nixpkgs-7e0127e1ca6f3e2bd56a52946745e4bfb2485028.tar.gz nixpkgs-7e0127e1ca6f3e2bd56a52946745e4bfb2485028.tar.bz2 nixpkgs-7e0127e1ca6f3e2bd56a52946745e4bfb2485028.tar.lz nixpkgs-7e0127e1ca6f3e2bd56a52946745e4bfb2485028.tar.xz nixpkgs-7e0127e1ca6f3e2bd56a52946745e4bfb2485028.tar.zst nixpkgs-7e0127e1ca6f3e2bd56a52946745e4bfb2485028.zip | |
tree-wide: inherit yarn2nix from yarn2nix-moretea
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/riot')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix | 4 | ||||
| -rwxr-xr-x | pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index ec3b42c1553..5dc61ff5cc8 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web, yarn2nix-moretea }: +{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web, mkYarnPackage }: # Notes for maintainers: # * versions of `riot-web` and `riot-desktop` should be kept in sync. @@ -14,7 +14,7 @@ let sha256 = "1xi5zg3602d7gdjxskpk2q3anpn2drrkxyirfvi9mzcfp2r05557"; }; -in yarn2nix-moretea.mkYarnPackage rec { +in mkYarnPackage rec { name = "riot-desktop-${version}"; inherit version; diff --git a/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh b/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh index b646a9e03ad..f516e4a76f0 100755 --- a/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh +++ b/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix-moretea.yarn2nix +#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix set -euo pipefail |