Merge staging into closure-size

The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.

1 files changed, 12 insertions, 12 deletions

diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix
index 1a6ab883c4ae6..fd060ad08801e 100644
--- a/pkgs/applications/networking/spideroak/default.nix
+++ b/pkgs/applications/networking/spideroak/default.nix
@@ -12,19 +12,19 @@ let
     else if stdenv.system == "i686-linux" then "ld-linux.so.2"
     else throw "Spideroak client for: ${stdenv.system} not supported!";
 
-  sha256 = if stdenv.system == "x86_64-linux" then "0ax5ij3fwq3q9agf7qkw2zg53fcd82llg734pq3swzpn3z1ajs38"
-    else if stdenv.system == "i686-linux" then "18hvgx8bvd2khnqfn434gd4mflv0w5y8kvim72rvya2kwxsyf3i1"
+  sha256 = if stdenv.system == "x86_64-linux" then "88fd785647def79ee36621fa2a8a5bea73c513de03103f068dd10bc25f3cf356"
+    else if stdenv.system == "i686-linux" then "8c23271291f40aa144bbf38ceb3cc2a05bed00759c87a65bd798cf8bb289d07a"
     else throw "Spideroak client for: ${stdenv.system} not supported!";
 
   ldpath = stdenv.lib.makeSearchPath "lib" [
-    glib fontconfig libXext libX11 freetype libXrender 
+    glib fontconfig libXext libX11 freetype libXrender
   ];
 
-  version = "5.1.6";
+  version = "6.0.1";
 
 in stdenv.mkDerivation {
   name = "spideroak-${version}";
-  
+
   src = fetchurl {
     name = "spideroak-${version}-${arch}";
     url = "https://spideroak.com/getbuild?platform=slackware&arch=${arch}&version=${version}";
@@ -36,17 +36,17 @@ in stdenv.mkDerivation {
   unpackCmd = "tar -xzf $curSrc";
 
   installPhase = ''
-    ensureDir "$out"
+    mkdir "$out"
     cp -r "./"* "$out"
-    ensureDir "$out/bin"
-    rm "$out/usr/bin/SpiderOak"
+    mkdir "$out/bin"
+    rm "$out/usr/bin/SpiderOakONE"
 
     patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} \
-      "$out/opt/SpiderOak/lib/SpiderOak"
+      "$out/opt/SpiderOakONE/lib/SpiderOakONE"
 
-    RPATH=$out/opt/SpiderOak/lib:${ldpath}
-    makeWrapper $out/opt/SpiderOak/lib/SpiderOak $out/bin/spideroak --set LD_LIBRARY_PATH $RPATH \
-      --set QT_PLUGIN_PATH $out/opt/SpiderOak/lib/plugins/ \
+    RPATH=$out/opt/SpiderOakONE/lib:${ldpath}
+    makeWrapper $out/opt/SpiderOakONE/lib/SpiderOakONE $out/bin/spideroak --set LD_LIBRARY_PATH $RPATH \
+      --set QT_PLUGIN_PATH $out/opt/SpiderOakONE/lib/plugins/ \
       --set SpiderOak_EXEC_SCRIPT $out/bin/spideroak
   '';