diff options
author | Nathan T.A. Lewis <nathan@nathantalewis.com> | 2019-03-30 17:27:37 -0600 |
---|---|---|
committer | xeji <36407913+xeji@users.noreply.github.com> | 2019-03-31 00:27:37 +0100 |
commit | ac8224ae9b544e3beec31d59db9a47107c71c1f2 (patch) | |
tree | b0ed12f88f2449b7e7807b59456f670416a281d5 /pkgs/applications/networking/spideroak | |
parent | fd3fdc31b4c89128a4ae2a2866fdb4d11bf28556 (diff) | |
download | nixlib-ac8224ae9b544e3beec31d59db9a47107c71c1f2.tar nixlib-ac8224ae9b544e3beec31d59db9a47107c71c1f2.tar.gz nixlib-ac8224ae9b544e3beec31d59db9a47107c71c1f2.tar.bz2 nixlib-ac8224ae9b544e3beec31d59db9a47107c71c1f2.tar.lz nixlib-ac8224ae9b544e3beec31d59db9a47107c71c1f2.tar.xz nixlib-ac8224ae9b544e3beec31d59db9a47107c71c1f2.tar.zst nixlib-ac8224ae9b544e3beec31d59db9a47107c71c1f2.zip |
spideroak: 7.1.0 -> 7.5.0 (#58450)
As of version 7.3.0, Spideroak no longer supports 32 bit on Linux.
Diffstat (limited to 'pkgs/applications/networking/spideroak')
-rw-r--r-- | pkgs/applications/networking/spideroak/default.nix | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index fdb4206d340f..d96a810ee05a 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -4,31 +4,21 @@ }: let - arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" - else if stdenv.hostPlatform.system == "i686-linux" then "x86" - else throw "Spideroak client for: ${stdenv.hostPlatform.system} not supported!"; - - interpreter = if stdenv.hostPlatform.system == "x86_64-linux" then "ld-linux-x86-64.so.2" - else if stdenv.hostPlatform.system == "i686-linux" then "ld-linux.so.2" - else throw "Spideroak client for: ${stdenv.hostPlatform.system} not supported!"; - - sha256 = if stdenv.hostPlatform.system == "x86_64-linux" then "a88e5a8fe4a565ac500668bd53cf5784752d7c9253304ddce39ee7b01d078533" - else if stdenv.hostPlatform.system == "i686-linux" then "668f3b83a974a3877d16c8743c233a427ea0a44ab84b7f9aec19a2995db66c16" - else throw "Spideroak client for: ${stdenv.hostPlatform.system} not supported!"; + sha256 = "6d6ca2b383bcc81af1217c696eb77864a2b6db7428f4b5bde5b5913ce705eec5"; ldpath = stdenv.lib.makeLibraryPath [ fontconfig freetype glib libICE libSM libX11 libXext libXrender zlib ]; - version = "7.1.0"; + version = "7.5.0"; in stdenv.mkDerivation { name = "spideroak-${version}"; src = fetchurl { - name = "SpiderOakONE-${version}-slack_tar_${arch}.tgz"; - url = "https://spideroak.com/release/spideroak/slack_tar_${arch}"; + name = "SpiderOakONE-${version}-slack_tar_x64.tgz"; + url = "https://spideroak.com/release/spideroak/slack_tar_x64"; inherit sha256; }; @@ -46,7 +36,7 @@ in stdenv.mkDerivation { rm -f $out/opt/SpiderOakONE/lib/libz* - patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} \ + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 \ "$out/opt/SpiderOakONE/lib/SpiderOakONE" RPATH=$out/opt/SpiderOakONE/lib:${ldpath} |