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

rambox: remove gapps-wrapper 

This is now provided by electron itself.
This commit is contained in:
Jörg Thalheim 2019-06-25 07:52:54 +01:00
parent ebe4375ff4
commit 205296f55a
No known key found for this signature in database
GPG Key ID: B3F5D81B0C6967C4
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/networking/instant-messengers/rambox/default.nix
View File

@ -1,5 +1,4 @@
{ stdenv, newScope, makeWrapper { stdenv, newScope, makeWrapper
, wrapGAppsHook, gnome3, glib
, electron, xdg_utils, makeDesktopItem , electron, xdg_utils, makeDesktopItem
, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU" , auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
, auth0Domain ? "nixpkgs.auth0.com" }: , auth0Domain ? "nixpkgs.auth0.com" }:
@ -28,9 +27,8 @@ with self;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "rambox-${rambox-bare.version}"; name = "rambox-${rambox-bare.version}";
nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ glib gnome3.gsettings_desktop_schemas ];
unpackPhase = ":"; unpackPhase = ":";
dontWrapGApps = true; # we only want $gappsWrapperArgs here dontWrapGApps = true; # we only want $gappsWrapperArgs here
@ -45,7 +43,6 @@ stdenv.mkDerivation {
postFixup = '' postFixup = ''
makeWrapper ${electron}/bin/electron $out/bin/rambox \ makeWrapper ${electron}/bin/electron $out/bin/rambox \
--add-flags "${rambox-bare} --without-update" \ --add-flags "${rambox-bare} --without-update" \
"''${gappsWrapperArgs[@]}" \
--prefix PATH : ${xdg_utils}/bin --prefix PATH : ${xdg_utils}/bin
''; '';