diff options
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index fe518ff4f68d..37fcafd961ae 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub , makeWrapper, makeDesktopItem, mkYarnPackage -, electron_7, riot-web, gtk3, +, electron_7, riot-web, gtk3 +, wrapGAppsHook, glib }: - # Notes for maintainers: # * versions of `riot-web` and `riot-desktop` should be kept in sync. # * the Yarn dependency expression must be updated with `./update-riot-desktop.sh <git release tag>` @@ -27,7 +27,14 @@ in mkYarnPackage rec { packageJSON = ./riot-desktop-package.json; yarnNix = ./riot-desktop-yarndeps.nix; - nativeBuildInputs = [ makeWrapper gtk3 ]; + nativeBuildInputs = [ wrapGAppsHook ]; + + extraBuildInputs = [ + glib + gtk3 + ]; + + dontWrapGApps = true; installPhase = '' # resources @@ -47,11 +54,13 @@ in mkYarnPackage rec { # desktop item mkdir -p "$out/share" ln -s "${desktopItem}/share/applications" "$out/share/applications" + ''; + postFixup = '' # executable wrapper makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ --add-flags "$out/share/riot/electron" \ - --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH + "''${gappsWrapperArgs[@]}" ''; # Do not attempt generating a tarball for riot-web again. |