Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fd3fdc31b4c8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ac8224ae9b54
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 30, 2019

  1. spideroak: 7.1.0 -> 7.5.0 (#58450) 

    As of version 7.3.0, Spideroak no longer supports 32 bit on Linux.
    @nathantalewis @xeji
    nathantalewis authored and xeji committed Mar 30, 2019
    Copy the full SHA
    ac8224a View commit details
Showing with 5 additions and 15 deletions.
  1. +5 −15 pkgs/applications/networking/spideroak/default.nix
20 changes: 5 additions & 15 deletions pkgs/applications/networking/spideroak/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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}