From 4d7dd8169c5f3fbf502a68203531aa5d8c03dc4c Mon Sep 17 00:00:00 2001
From: Neil Mayhew <neil@neil.mayhew.name>
Date: Sat, 16 Sep 2017 11:07:13 -0600
Subject: [PATCH] spideroak: fix crash due to zlib version mismatch

Fixes #23960
---
 pkgs/applications/networking/spideroak/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix
index b9d74bee83d8..6c8e3466ce0d 100644
--- a/pkgs/applications/networking/spideroak/default.nix
+++ b/pkgs/applications/networking/spideroak/default.nix
@@ -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"