diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-30 13:32:19 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-30 13:32:19 +0000 |
commit | 9f8828286212d8ce7b0fb3578c5f209c434dc60a (patch) | |
tree | 80b1d2d8bb686a52700e53602838bfa1cad59570 /pkgs/applications/networking | |
parent | 6f3afd1dad1e3e14cb5b3db102ef94373c1a58d8 (diff) | |
parent | 9d9f7d27a1930642de86c6660d0326ce89a61c61 (diff) | |
download | nixlib-9f8828286212d8ce7b0fb3578c5f209c434dc60a.tar nixlib-9f8828286212d8ce7b0fb3578c5f209c434dc60a.tar.gz nixlib-9f8828286212d8ce7b0fb3578c5f209c434dc60a.tar.bz2 nixlib-9f8828286212d8ce7b0fb3578c5f209c434dc60a.tar.lz nixlib-9f8828286212d8ce7b0fb3578c5f209c434dc60a.tar.xz nixlib-9f8828286212d8ce7b0fb3578c5f209c434dc60a.tar.zst nixlib-9f8828286212d8ce7b0fb3578c5f209c434dc60a.zip |
Merge pull request #49450 from Mic92/rambox
rambox: fix crash when downloading files to disk
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/rambox/default.nix | 19 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix | 6 |
2 files changed, 18 insertions, 7 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 // { diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix index af92462a2a49..efecebe169e9 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, gzip, which, unzip, jdk }: let - version = "6.5.3.6"; + version = "6.6.0.13"; srcs = { i686-linux = fetchurl { url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip"; - sha256 = "0g3hk3fdgmkdsr6ck1fgsmaxa9wbj2fpk84rk382ff9ny55bbzv9"; + sha256 = "15b197108b49mf0afpihkh3p68lxm7580zz2w0xsbahglnvhwyfz"; }; x86_64-linux = fetchurl { url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip"; - sha256 = "08j8gak1xsxdjgkv6s24jv97jc49pi5yf906ynjmxb27wqpxn9mz"; + sha256 = "1cxhckmx1802p9qiw09cgb1v5f30wcvnrwkshmia8p8n0q47lpp4"; }; }; in |