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

Merge pull request #84245 from rnhmjoj/riot-fix

Browse Source 
riot-desktop: add gsettings schemas to the wrapper
This commit is contained in:
Michele Guerini Rocco 2020-04-04 20:07:07 +02:00 committed by GitHub
commit 4540716848
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,7 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_7, riot-web, mkYarnPackage }: { stdenv, fetchFromGitHub
, makeWrapper, makeDesktopItem, mkYarnPackage
, electron_7, riot-web, gtk3,
}:
# 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.
@ -24,7 +27,7 @@ in mkYarnPackage rec {
packageJSON = ./riot-desktop-package.json; packageJSON = ./riot-desktop-package.json;
yarnNix = ./riot-desktop-yarndeps.nix; yarnNix = ./riot-desktop-yarndeps.nix;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper gtk3 ];
installPhase = '' installPhase = ''
# resources # resources
@ -47,7 +50,8 @@ in mkYarnPackage rec {
# executable wrapper # executable wrapper
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
--add-flags "$out/share/riot/electron" --add-flags "$out/share/riot/electron" \
--prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH
''; '';
# Do not attempt generating a tarball for riot-web again. # Do not attempt generating a tarball for riot-web again.