mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
Merge pull request #29481 from neilmayhew/fix/spideroak
spideroak: fix crash due to zlib version mismatch
This commit is contained in:
commit
a80067636e
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, makeWrapper, glib
|
||||
, fontconfig, patchelf, libXext, libX11
|
||||
, freetype, libXrender
|
||||
, freetype, libXrender, zlib
|
||||
}:
|
||||
|
||||
let
|
||||
@ -17,7 +17,7 @@ let
|
||||
else throw "Spideroak client for: ${stdenv.system} not supported!";
|
||||
|
||||
ldpath = stdenv.lib.makeLibraryPath [
|
||||
glib fontconfig libXext libX11 freetype libXrender
|
||||
glib fontconfig libXext libX11 freetype libXrender zlib
|
||||
];
|
||||
|
||||
version = "6.0.1";
|
||||
@ -43,6 +43,8 @@ in stdenv.mkDerivation {
|
||||
rmdir $out/usr/bin || true
|
||||
mv $out/usr/share $out/
|
||||
|
||||
rm -f $out/opt/SpiderOakONE/lib/libz*
|
||||
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} \
|
||||
"$out/opt/SpiderOakONE/lib/SpiderOakONE"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user