Merge pull request #84245 from rnhmjoj/riot-fix
riot-desktop: add gsettings schemas to the wrapper
This commit is contained in:
commit
4540716848
|
@ -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:
|
||||
# * versions of `riot-web` and `riot-desktop` should be kept in sync.
|
||||
|
@ -24,7 +27,7 @@ in mkYarnPackage rec {
|
|||
packageJSON = ./riot-desktop-package.json;
|
||||
yarnNix = ./riot-desktop-yarndeps.nix;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeWrapper gtk3 ];
|
||||
|
||||
installPhase = ''
|
||||
# resources
|
||||
|
@ -47,7 +50,8 @@ in mkYarnPackage rec {
|
|||
|
||||
# executable wrapper
|
||||
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.
|
||||
|
|
Loading…
Reference in a new issue