diff options
| author | Peter Hoeg <peter@speartail.com> | 2016-08-29 15:42:49 +0800 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-08-29 07:42:49 +0000 |
| commit | da6e81ff6bf1e1f008f4c1ee0a0c67a722ca6b18 (patch) | |
| tree | b693c18b29d5054dcdfc580b8135b55f6cd9c0d2 /pkgs | |
| parent | 6a11b11a7d8d89e724d0c1670777d196204f33e4 (diff) | |
| download | nixpkgs-da6e81ff6bf1e1f008f4c1ee0a0c67a722ca6b18.tar nixpkgs-da6e81ff6bf1e1f008f4c1ee0a0c67a722ca6b18.tar.gz nixpkgs-da6e81ff6bf1e1f008f4c1ee0a0c67a722ca6b18.tar.bz2 nixpkgs-da6e81ff6bf1e1f008f4c1ee0a0c67a722ca6b18.tar.lz nixpkgs-da6e81ff6bf1e1f008f4c1ee0a0c67a722ca6b18.tar.xz nixpkgs-da6e81ff6bf1e1f008f4c1ee0a0c67a722ca6b18.tar.zst nixpkgs-da6e81ff6bf1e1f008f4c1ee0a0c67a722ca6b18.zip | |
dropbox: 8.4.19 -> 8.4.21 (#18079)
Additionally, we set proper permissions on the files in the output.
Diffstat (limited to 'pkgs')
| -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 eadd85d4648..b98e7eea14b 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 = '' |