diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 12:14:51 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 15:09:50 -0500 |
commit | d8d5e9868cecd03e7a8e73208e019d79f1376ed8 (patch) | |
tree | e20fe7e2fa30841295d544f2509bade990c84d69 /pkgs/applications | |
parent | f998d502fc6efe727659ad883c17acecb9177c0d (diff) | |
download | nixlib-d8d5e9868cecd03e7a8e73208e019d79f1376ed8.tar nixlib-d8d5e9868cecd03e7a8e73208e019d79f1376ed8.tar.gz nixlib-d8d5e9868cecd03e7a8e73208e019d79f1376ed8.tar.bz2 nixlib-d8d5e9868cecd03e7a8e73208e019d79f1376ed8.tar.lz nixlib-d8d5e9868cecd03e7a8e73208e019d79f1376ed8.tar.xz nixlib-d8d5e9868cecd03e7a8e73208e019d79f1376ed8.tar.zst nixlib-d8d5e9868cecd03e7a8e73208e019d79f1376ed8.zip |
dropbox: prepare for Qt upgrade
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/dropbox/default.nix | 82 |
1 files changed, 53 insertions, 29 deletions
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index f212304b96cc..08a4b0dacbd9 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf , dbus_libs, gcc, glib, libdrm, libffi, libICE, libSM , libX11, libXmu, ncurses, popt, qt5, zlib , qtbase, qtdeclarative, qtwebkit @@ -33,20 +33,13 @@ let "i686-linux" = "x86"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - interpreter = - { - "x86_64-linux" = "ld-linux-x86-64.so.2"; - "i686-linux" = "ld-linux.so.2"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - # relative location where the dropbox libraries are stored appdir = "opt/dropbox"; ldpath = stdenv.lib.makeSearchPath "lib" [ - dbus_libs gcc glib libdrm libffi libICE libSM libX11 - libXmu ncurses popt qtbase qtdeclarative qtwebkit - zlib + dbus_libs gcc.cc glib libdrm libffi libICE libSM libX11 libXmu + ncurses popt qtbase qtdeclarative qtwebkit zlib ]; desktopItem = makeDesktopItem { @@ -59,24 +52,22 @@ let }; in stdenv.mkDerivation { - name = "dropbox-${version}-bin"; + name = "dropbox-${version}"; src = fetchurl { name = "dropbox-${version}.tar.gz"; url = "https://dl-web.dropbox.com/u/17/dropbox-lnx.${arch}-${version}.tar.gz"; inherit sha256; }; - sourceRoot = "."; + sourceRoot = ".dropbox-dist"; - patchPhase = '' - rm -f .dropbox-dist/dropboxd - ''; - - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper patchelf ]; + dontPatchELF = true; # patchelf invoked explicitly below + dontStrip = true; # already done installPhase = '' mkdir -p "$out/${appdir}" - cp -r ".dropbox-dist/dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/" + cp -r "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/" rm "$out/${appdir}/libdrm.so.2" rm "$out/${appdir}/libffi.so.6" @@ -102,23 +93,56 @@ in stdenv.mkDerivation { rm "$out/${appdir}/qt.conf" rm -fr "$out/${appdir}/plugins" - 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 \ - -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \; - mkdir -p "$out/share/applications" cp "${desktopItem}/share/applications/"* $out/share/applications + mkdir -p "$out/share/icons" + ln -s "$out/${appdir}/images/hicolor" "$out/share/icons/hicolor" + mkdir -p "$out/bin" + RPATH="${ldpath}:$out/${appdir}" makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ - --prefix LD_LIBRARY_PATH : "${ldpath}" + --prefix LD_LIBRARY_PATH : "$RPATH" + ''; - mkdir -p "$out/share/icons" - ln -s "$out/${appdir}/images/hicolor" "$out/share/icons/hicolor" + fixupPhase = '' + INTERP=$(cat $NIX_CC/nix-support/dynamic-linker) + RPATH="${ldpath}:$out/${appdir}" + getType='s/ *Type: *\([A-Z]*\) (.*/\1/' + find "$out/${appdir}" -type f -a -perm -0100 -print | while read obj; do + dynamic=$(readelf -S "$obj" 2>/dev/null | grep "DYNAMIC" || true) + + if [[ -n "$dynamic" ]]; then + type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType") + + if [[ "$type" == "EXEC" ]]; then + + echo "patching interpreter path in $type $obj" + patchelf --set-interpreter "$INTERP" "$obj" + + echo "patching RPATH in $type $obj" + oldRPATH=$(patchelf --print-rpath "$obj") + patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj" + + echo "shrinking RPATH in $type $obj" + patchelf --shrink-rpath "$obj" + + elif [[ "$type" == "DYN" ]]; then + + echo "patching RPATH in $type $obj" + 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" + + fi + fi + done ''; meta = { |