diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-29 12:44:17 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-29 12:44:17 +0100 |
| commit | b74793bd1c458fec6e2dfc57d83ca1f33ac0f736 (patch) | |
| tree | 3a55306c8908eeecb78dedffe07bfd3e17693730 /pkgs/applications/networking | |
| parent | f3c994ca11ecfdf1966a143abe7a5007cc1c84e7 (diff) | |
| parent | 898edb0fbc3f23b24b7e28bad0cdd3e57ad5dcc7 (diff) | |
| download | nixlib-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar nixlib-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.gz nixlib-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.bz2 nixlib-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.lz nixlib-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.xz nixlib-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.tar.zst nixlib-b74793bd1c458fec6e2dfc57d83ca1f33ac0f736.zip | |
Merge branch 'master' into staging
Conflicts: pkgs/tools/system/facter/default.nix
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/dropbox/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index eadd85d46487..b98e7eea14b5 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,17 +23,17 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "8.4.19"; + version = "8.4.21"; sha256 = { - "x86_64-linux" = "0pm43cklsm41mg463mz0ypvbladm2mz65s7ar9z4k4hgjrhyh67j"; - "i686-linux" = "0myz8s2xdl034zb4548fgzz2f5gfvzfr1nwp50fh3f3hmf6frgp3"; + "x86_64-linux" = "1nihmr99mzyjhhdlg39j6g0m6hqgdz80lgrjdw1nnh38vq4fgbnq"; + "i686-linux" = "09jfdc8isjcpvgnvfykawlvdq65ng0dg6b54m4vdswk58ggndvlq"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = { "x86_64-linux" = "x86_64"; - "i686-linux" = "x86"; + "i686-linux" = "x86"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); # relative location where the dropbox libraries are stored @@ -74,7 +74,7 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p "$out/${appdir}" - cp -r "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/" + cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/" rm "$out/${appdir}/libdrm.so.2" rm "$out/${appdir}/libffi.so.6" @@ -104,6 +104,8 @@ in stdenv.mkDerivation { RPATH="${ldpath}:$out/${appdir}" makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ --prefix LD_LIBRARY_PATH : "$RPATH" + + chmod 755 $out/${appdir}/dropbox ''; fixupPhase = '' |