Skip to content

Commit

Permalink
riot-desktop: wrap with wrapGAppsHook
Browse files Browse the repository at this point in the history
  • Loading branch information
worldofpeace committed Apr 6, 2020
1 parent 204d7bc commit fe6addb
Showing 1 changed file with 17 additions and 4 deletions.
@@ -1,5 +1,8 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_7, riot-web, mkYarnPackage }:

{ stdenv, fetchFromGitHub
, makeWrapper, makeDesktopItem, mkYarnPackage
, 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>`
Expand All @@ -24,7 +27,14 @@ in mkYarnPackage rec {
packageJSON = ./riot-desktop-package.json;
yarnNix = ./riot-desktop-yarndeps.nix;

nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ wrapGAppsHook ];

extraBuildInputs = [
glib
gtk3
];

dontWrapGApps = true;

installPhase = ''
# resources
Expand All @@ -44,10 +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"
--add-flags "$out/share/riot/electron" \
"''${gappsWrapperArgs[@]}"
'';

# Do not attempt generating a tarball for riot-web again.
Expand Down

0 comments on commit fe6addb

Please sign in to comment.