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

Merge pull request #49450 from Mic92/rambox 

rambox: fix crash when downloading files to disk
This commit is contained in:
Jörg Thalheim 2018-10-30 13:32:19 +00:00 committed by GitHub
parent 6f3afd1dad 9d9f7d27a1
commit 9f88282862
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 // {

6
pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, gzip, which, unzip, jdk }: { stdenv, fetchurl, gzip, which, unzip, jdk }:
let let
version = "6.5.3.6"; version = "6.6.0.13";
srcs = { srcs = {
i686-linux = fetchurl { i686-linux = fetchurl {
url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip"; url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip";
sha256 = "0g3hk3fdgmkdsr6ck1fgsmaxa9wbj2fpk84rk382ff9ny55bbzv9"; sha256 = "15b197108b49mf0afpihkh3p68lxm7580zz2w0xsbahglnvhwyfz";
}; };
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip"; url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip";
sha256 = "08j8gak1xsxdjgkv6s24jv97jc49pi5yf906ynjmxb27wqpxn9mz"; sha256 = "1cxhckmx1802p9qiw09cgb1v5f30wcvnrwkshmia8p8n0q47lpp4";
}; };
}; };
in in