3
0
Fork 0
forked from mirrors/nixpkgs

dropbox: leave RPATH-shrinking to patchelf setup hook

(cherry picked from commit 2e591bac0d)
This commit is contained in:
Thomas Tuegel 2017-03-29 07:35:52 -05:00
parent 152c9ed87f
commit bf66a181fe
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59

View file

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