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

Merge pull request #84285 from worldofpeace/riot-gsettings

Browse Source 
riot-desktop: wrap with wrapGAppsHook
This commit is contained in:
worldofpeace 2020-04-06 03:51:15 -04:00 committed by GitHub
commit 52a62d3499
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, makeWrapper, makeDesktopItem, mkYarnPackage , makeWrapper, makeDesktopItem, mkYarnPackage
, electron_7, riot-web, gtk3, , electron_7, riot-web, gtk3
, wrapGAppsHook, glib
}: }:
# 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.
# * the Yarn dependency expression must be updated with `./update-riot-desktop.sh <git release tag>` # * 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; packageJSON = ./riot-desktop-package.json;
yarnNix = ./riot-desktop-yarndeps.nix; yarnNix = ./riot-desktop-yarndeps.nix;
nativeBuildInputs = [ makeWrapper gtk3 ]; nativeBuildInputs = [ wrapGAppsHook ];
extraBuildInputs = [
glib
gtk3
];
dontWrapGApps = true;
installPhase = '' installPhase = ''
# resources # resources
@ -47,11 +54,13 @@ in mkYarnPackage rec {
# desktop item # desktop item
mkdir -p "$out/share" mkdir -p "$out/share"
ln -s "${desktopItem}/share/applications" "$out/share/applications" ln -s "${desktopItem}/share/applications" "$out/share/applications"
'';
postFixup = ''
# 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 "''${gappsWrapperArgs[@]}"
''; '';
# Do not attempt generating a tarball for riot-web again. # Do not attempt generating a tarball for riot-web again.