diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2020-04-04 20:07:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-04 20:07:07 +0200 |
| commit | 45407168487b9d860aba1b1e9ab7a4b29eda627e (patch) | |
| tree | c9591f7bbe520abbf15c1b1e2e48d37412c73bcd /pkgs/applications/networking | |
| parent | 5572974c0d1bc496cef90e0dd7aaac81c5e5a1d9 (diff) | |
| parent | 1af6a1a1346ea596f766da703ba434d1faee7321 (diff) | |
| download | nixlib-45407168487b9d860aba1b1e9ab7a4b29eda627e.tar nixlib-45407168487b9d860aba1b1e9ab7a4b29eda627e.tar.gz nixlib-45407168487b9d860aba1b1e9ab7a4b29eda627e.tar.bz2 nixlib-45407168487b9d860aba1b1e9ab7a4b29eda627e.tar.lz nixlib-45407168487b9d860aba1b1e9ab7a4b29eda627e.tar.xz nixlib-45407168487b9d860aba1b1e9ab7a4b29eda627e.tar.zst nixlib-45407168487b9d860aba1b1e9ab7a4b29eda627e.zip | |
Merge pull request #84245 from rnhmjoj/riot-fix
riot-desktop: add gsettings schemas to the wrapper
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix | 10 |
1 files changed, 7 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 5bb2e4e40a03..fe518ff4f68d 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -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. |