mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-19 17:39:34 +00:00
riot-desktop: wrap with wrapGAppsHook
wrap as per https://nixos.org/nixpkgs/manual/#sec-language-gnome.
This commit is contained in:
parent
204d7bc28b
commit
fe6addbbf7
|
@ -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:
|
# 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>`
|
||||||
|
@ -24,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 ];
|
nativeBuildInputs = [ wrapGAppsHook ];
|
||||||
|
|
||||||
|
extraBuildInputs = [
|
||||||
|
glib
|
||||||
|
gtk3
|
||||||
|
];
|
||||||
|
|
||||||
|
dontWrapGApps = true;
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
# resources
|
# resources
|
||||||
|
@ -44,10 +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" \
|
||||||
|
"''${gappsWrapperArgs[@]}"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Do not attempt generating a tarball for riot-web again.
|
# Do not attempt generating a tarball for riot-web again.
|
||||||
|
|
Loading…
Reference in a new issue