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

Merge pull request #29481 from neilmayhew/fix/spideroak

Browse Source 
spideroak: fix crash due to zlib version mismatch
This commit is contained in:
Tim Steinbach 2017-09-21 07:59:32 -04:00 committed by GitHub
commit a80067636e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/spideroak/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, glib { stdenv, fetchurl, makeWrapper, glib
, fontconfig, patchelf, libXext, libX11 , fontconfig, patchelf, libXext, libX11
, freetype, libXrender , freetype, libXrender, zlib
}: }:
let let
@ -17,7 +17,7 @@ let
else throw "Spideroak client for: ${stdenv.system} not supported!"; else throw "Spideroak client for: ${stdenv.system} not supported!";
ldpath = stdenv.lib.makeLibraryPath [ ldpath = stdenv.lib.makeLibraryPath [
glib fontconfig libXext libX11 freetype libXrender glib fontconfig libXext libX11 freetype libXrender zlib
]; ];
version = "6.0.1"; version = "6.0.1";
@ -43,6 +43,8 @@ in stdenv.mkDerivation {
rmdir $out/usr/bin || true rmdir $out/usr/bin || true
mv $out/usr/share $out/ mv $out/usr/share $out/
rm -f $out/opt/SpiderOakONE/lib/libz*
patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} \ patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} \
"$out/opt/SpiderOakONE/lib/SpiderOakONE" "$out/opt/SpiderOakONE/lib/SpiderOakONE"