diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-06 10:21:43 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-06 10:26:30 +0200 |
commit | 8f33b8cc93006c97a8f6b7ede20214992ed31fa8 (patch) | |
tree | 319163313cd55a160bbd9376151da1c96e124fd2 /pkgs/applications/networking/dropbox | |
parent | f67ddbaa6f049cdd2a5e2333e3679c4f5f4b638f (diff) | |
download | nixlib-8f33b8cc93006c97a8f6b7ede20214992ed31fa8.tar nixlib-8f33b8cc93006c97a8f6b7ede20214992ed31fa8.tar.gz nixlib-8f33b8cc93006c97a8f6b7ede20214992ed31fa8.tar.bz2 nixlib-8f33b8cc93006c97a8f6b7ede20214992ed31fa8.tar.lz nixlib-8f33b8cc93006c97a8f6b7ede20214992ed31fa8.tar.xz nixlib-8f33b8cc93006c97a8f6b7ede20214992ed31fa8.tar.zst nixlib-8f33b8cc93006c97a8f6b7ede20214992ed31fa8.zip |
mass rewrite of find parameters to cross-platform style
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution. Now we have no modes starting with `/` or `+`. Rewrite the `-perm` parameters of find: - completely safe: rewrite `/0100` and `+100` to `-0100`, - slightly semantics-changing: rewrite `+111` to `-0100`. I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
Diffstat (limited to 'pkgs/applications/networking/dropbox')
-rw-r--r-- | pkgs/applications/networking/dropbox/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 3fa6fb51ee14..0af5dfba3f24 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -101,12 +101,12 @@ in stdenv.mkDerivation { rm "$out/${appdir}/qt.conf" rm -fr "$out/${appdir}/plugins" - find "$out/${appdir}" -type f -a -perm /0100 \ + find "$out/${appdir}" -type f -a -perm -0100 \ -print -exec patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} {} \; RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir} echo "updating rpaths to: $RPATH" - find "$out/${appdir}" -type f -a -perm /0100 \ + find "$out/${appdir}" -type f -a -perm -0100 \ -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; mkdir -p "$out/share/applications" |