diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-04 17:30:18 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-06 03:34:23 -0400 |
| commit | fe6addbbf717d4977434e81acd7535c3b074e3a3 (patch) | |
| tree | fd6a6cf918386b53624f8a4f132c38f576f3d94f /pkgs | |
| parent | 204d7bc28b864d6cf79317a6ec59190e08890fa0 (diff) | |
| download | nixpkgs-fe6addbbf717d4977434e81acd7535c3b074e3a3.tar nixpkgs-fe6addbbf717d4977434e81acd7535c3b074e3a3.tar.gz nixpkgs-fe6addbbf717d4977434e81acd7535c3b074e3a3.tar.bz2 nixpkgs-fe6addbbf717d4977434e81acd7535c3b074e3a3.tar.lz nixpkgs-fe6addbbf717d4977434e81acd7535c3b074e3a3.tar.xz nixpkgs-fe6addbbf717d4977434e81acd7535c3b074e3a3.tar.zst nixpkgs-fe6addbbf717d4977434e81acd7535c3b074e3a3.zip | |
riot-desktop: wrap with wrapGAppsHook
wrap as per https://nixos.org/nixpkgs/manual/#sec-language-gnome.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix | 21 |
1 files changed, 17 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 5bb2e4e40a0..37fcafd961a 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -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>` @@ -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 @@ -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. |