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

Revert "riot-desktop: wrap with wrapGAppsHook"

Browse Source 
This reverts commit fe6addbbf717d4977434e81acd7535c3b074e3a3.
This commit is contained in:
Pavol Rusnak 2020-04-11 12:05:57 +02:00
parent 7cbffa0530
commit 3abd151f8e
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 3 additions and 14 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,7 +1,6 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, makeWrapper, makeDesktopItem, mkYarnPackage , makeWrapper, makeDesktopItem, mkYarnPackage
, electron_7, riot-web, gtk3 , electron_7, riot-web
, 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.
@ -27,14 +26,7 @@ in mkYarnPackage rec {
packageJSON = ./riot-desktop-package.json; packageJSON = ./riot-desktop-package.json;
yarnNix = ./riot-desktop-yarndeps.nix; yarnNix = ./riot-desktop-yarndeps.nix;
nativeBuildInputs = [ wrapGAppsHook ]; nativeBuildInputs = [ makeWrapper ];
extraBuildInputs = [
glib
gtk3
];
dontWrapGApps = true;
installPhase = '' installPhase = ''
# resources # resources
@ -54,13 +46,10 @@ 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.