diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2018-10-30 11:40:53 +0000 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2018-10-30 11:41:52 +0000 |
commit | ac8acb283c6380d01e6a9d6722ccebb4cdddaa9c (patch) | |
tree | 381b847eeb1ca2dc52c7c8833a6fdf3587e6d7ed /pkgs/applications/networking | |
parent | be08e693726a892a8916462bd1cc26c34f932091 (diff) | |
download | nixlib-ac8acb283c6380d01e6a9d6722ccebb4cdddaa9c.tar nixlib-ac8acb283c6380d01e6a9d6722ccebb4cdddaa9c.tar.gz nixlib-ac8acb283c6380d01e6a9d6722ccebb4cdddaa9c.tar.bz2 nixlib-ac8acb283c6380d01e6a9d6722ccebb4cdddaa9c.tar.lz nixlib-ac8acb283c6380d01e6a9d6722ccebb4cdddaa9c.tar.xz nixlib-ac8acb283c6380d01e6a9d6722ccebb4cdddaa9c.tar.zst nixlib-ac8acb283c6380d01e6a9d6722ccebb4cdddaa9c.zip |
rambox: fix crash when native filesystem dialogs are created
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/rambox/default.nix | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 7c630e522afe..46157c2a35f3 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,4 +1,6 @@ -{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem +{ stdenv, newScope, makeWrapper +, wrapGAppsHook, gnome3, glib +, electron, xdg_utils, makeDesktopItem , auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU" , auth0Domain ? "nixpkgs.auth0.com" }: @@ -26,16 +28,25 @@ with self; stdenv.mkDerivation { name = "rambox-${rambox-bare.version}"; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + buildInputs = [ glib gnome3.gsettings_desktop_schemas ]; unpackPhase = ":"; + dontWrapGApps = true; # we only want $gappsWrapperArgs here + installPhase = '' + runHook preInstall + mkdir -p $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 - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications ''; inherit (rambox-bare.meta // { |