forked from mirrors/nixpkgs
rambox: fix crash when native filesystem dialogs are created
This commit is contained in:
parent
be08e69372
commit
ac8acb283c
|
@ -1,4 +1,6 @@
|
||||||
{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem
|
{ stdenv, newScope, makeWrapper
|
||||||
|
, wrapGAppsHook, gnome3, glib
|
||||||
|
, electron, xdg_utils, makeDesktopItem
|
||||||
, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
|
, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
|
||||||
, auth0Domain ? "nixpkgs.auth0.com" }:
|
, auth0Domain ? "nixpkgs.auth0.com" }:
|
||||||
|
|
||||||
|
@ -26,16 +28,25 @@ with self;
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "rambox-${rambox-bare.version}";
|
name = "rambox-${rambox-bare.version}";
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
|
||||||
|
|
||||||
|
buildInputs = [ glib gnome3.gsettings_desktop_schemas ];
|
||||||
unpackPhase = ":";
|
unpackPhase = ":";
|
||||||
|
|
||||||
|
dontWrapGApps = true; # we only want $gappsWrapperArgs here
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
makeWrapper ${electron}/bin/electron $out/bin/rambox \
|
runHook preInstall
|
||||||
--add-flags "${rambox-bare} --without-update" \
|
|
||||||
--prefix PATH : ${xdg_utils}/bin
|
|
||||||
mkdir -p $out/share/applications
|
mkdir -p $out/share/applications
|
||||||
ln -s ${desktopItem}/share/applications/* $out/share/applications
|
ln -s ${desktopItem}/share/applications/* $out/share/applications
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
makeWrapper ${electron}/bin/electron $out/bin/rambox \
|
||||||
|
--add-flags "${rambox-bare} --without-update" \
|
||||||
|
"''${gappsWrapperArgs[@]}" \
|
||||||
|
--prefix PATH : ${xdg_utils}/bin
|
||||||
'';
|
'';
|
||||||
|
|
||||||
inherit (rambox-bare.meta // {
|
inherit (rambox-bare.meta // {
|
||||||
|
|
Loading…
Reference in a new issue