public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dropbox: leave RPATH-shrinking to patchelf setup hook

This commit is contained in:
Thomas Tuegel 2017-03-29 07:35:52 -05:00
parent 096c72e255
commit 2e591bac0d
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/dropbox/default.nix
View File

@ -68,7 +68,6 @@ in stdenv.mkDerivation {
sourceRoot = ".dropbox-dist"; sourceRoot = ".dropbox-dist";
dontPatchELF = true; # patchelf invoked explicitly below
nativeBuildInputs = [ makeQtWrapper patchelf ]; nativeBuildInputs = [ makeQtWrapper patchelf ];
dontStrip = true; # already done dontStrip = true; # already done
@ -121,9 +120,6 @@ in stdenv.mkDerivation {
oldRPATH=$(patchelf --print-rpath "$obj") oldRPATH=$(patchelf --print-rpath "$obj")
patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj" patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj"
echo "shrinking RPATH in $type $obj"
patchelf --shrink-rpath "$obj"
else else
echo "unknown ELF type \"$type\"; not patching $obj" echo "unknown ELF type \"$type\"; not patching $obj"