Merge branch 'dropbox'

pkgs/applications/networking/dropbox/default.nix

@@ -1,8 +1,6 @@
-{ stdenv, fetchurl, makeDesktopItem
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper
-, libSM, libX11, libXext, libXcomposite, libXcursor, libXdamage
+, dbus_libs, gcc, glib, libdrm, libffi, libICE, libSM
-, libXfixes, libXi, libXinerama, libXrandr, libXrender
+, libX11, libXmu, ncurses, popt, qt5, zlib
-, dbus, dbus_glib, fontconfig, gcc, patchelf
-, atk, glib, gdk_pixbuf, gtk, pango, zlib
 }:
 
 # this package contains the daemon version of dropbox
@@ -11,10 +9,13 @@
 # note: the resulting program has to be invoced as
 # 'dropbox' because the internal python engine takes
 # uses the name of the program as starting point.
-#
+
-# todo: dropbox is shipped with some copies of libraries.
+# Dropbox ships with its own copies of some libraries.
-# replace these libraries with the appropriate ones in
+# Unfortunately, upstream makes changes to the source of
-# nixpkgs.
+# some libraries, rendering them incompatible with the
+# open-source versions. Wherever possible, we must try
+# to make the bundled libraries work, rather than replacing
+# them with our own.
 
 let
   arch = if stdenv.system == "x86_64-linux" then "x86_64"
@@ -25,22 +26,19 @@ let
     else if stdenv.system == "i686-linux" then "ld-linux.so.2"
     else throw "Dropbox client for: ${stdenv.system} not supported!";
 
-  version = "2.10.52";
+  version = "3.2.6";
-  sha256 = if stdenv.system == "x86_64-linux" then "0fn2frp00f0p0r6v5czzxfbw1ifan9w12k3ry8gq1m4bvx6g27p6"
+  sha256 = if stdenv.system == "x86_64-linux" then "1pih4dgqsxx9s8vjmn49qdrrgfkkw8wl3m68x7mdz6wqb4lj3sry"
-    else if stdenv.system == "i686-linux" then "1rm5kspb53zqgaz48v8x3ffk1mcfi0nh0zsmsdniyrgqbis5mmm9"
+    else if stdenv.system == "i686-linux" then "0nnxj32xvhn312a16fhhxjf0brbivaw6m0s8d8qdn44qmg9fr4bz"
     else throw "Dropbox client for: ${stdenv.system} not supported!";
 
   # relative location where the dropbox libraries are stored
   appdir = "opt/dropbox";
 
-  # Libraries referenced by dropbox binary.
+  ldpath = stdenv.lib.makeSearchPath "lib"
-  # Be aware that future versions of the dropbox binary may refer
+    [
-  # to different versions than are currently in these packages.
+      dbus_libs gcc glib libdrm libffi libICE libSM libX11
-  ldpath = stdenv.lib.makeSearchPath "lib" [
+      libXmu ncurses popt qt5.base qt5.declarative qt5.webkit
-      libSM libX11 libXext libXcomposite libXcursor libXdamage
+      zlib
-      libXfixes libXi libXinerama libXrandr libXrender
-      atk dbus dbus_glib glib fontconfig gcc gdk_pixbuf
-      gtk pango zlib
     ];
 
   desktopItem = makeDesktopItem {
@@ -56,7 +54,6 @@ in stdenv.mkDerivation {
   name = "dropbox-${version}-bin";
   src = fetchurl {
     name = "dropbox-${version}.tar.gz";
-    
     url = "https://dl-web.dropbox.com/u/17/dropbox-lnx.${arch}-${version}.tar.gz";
     inherit sha256;
   };
@@ -67,15 +64,39 @@ in stdenv.mkDerivation {
     rm -f .dropbox-dist/dropboxd
   '';
 
+  buildInputs = [ makeWrapper ];
+
   installPhase = ''
     mkdir -p "$out/${appdir}"
     cp -r ".dropbox-dist/dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/"
-    mkdir -p "$out/bin"
-    ln -s "$out/${appdir}/dropbox" "$out/bin/dropbox"
 
-    patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
+    rm "$out/${appdir}/libdrm.so.2"
-      "$out/${appdir}/dropbox"
+    rm "$out/${appdir}/libffi.so.6"
-    
+    rm "$out/${appdir}/libicudata.so.42"
+    rm "$out/${appdir}/libicui18n.so.42"
+    rm "$out/${appdir}/libicuuc.so.42"
+    rm "$out/${appdir}/libGL.so.1"
+    rm "$out/${appdir}/libpopt.so.0"
+    rm "$out/${appdir}/libQt5Core.so.5"
+    rm "$out/${appdir}/libQt5DBus.so.5"
+    rm "$out/${appdir}/libQt5Gui.so.5"
+    rm "$out/${appdir}/libQt5Network.so.5"
+    rm "$out/${appdir}/libQt5OpenGL.so.5"
+    rm "$out/${appdir}/libQt5PrintSupport.so.5"
+    rm "$out/${appdir}/libQt5Qml.so.5"
+    rm "$out/${appdir}/libQt5Quick.so.5"
+    rm "$out/${appdir}/libQt5Sql.so.5"
+    rm "$out/${appdir}/libQt5WebKit.so.5"
+    rm "$out/${appdir}/libQt5WebKitWidgets.so.5"
+    rm "$out/${appdir}/libQt5Widgets.so.5"
+    rm "$out/${appdir}/libX11-xcb.so.1"
+
+    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 \
@@ -83,6 +104,10 @@ in stdenv.mkDerivation {
 
     mkdir -p "$out/share/applications"
     cp "${desktopItem}/share/applications/"* $out/share/applications
+
+    mkdir -p "$out/bin"
+    makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
+      --prefix LD_LIBRARY_PATH : "${ldpath}"
   '';
 
   meta = {

pkgs/top-level/all-packages.nix

@@ -11384,7 +11384,9 @@ let
 
   copy-com = callPackage ../applications/networking/copy-com { };
 
-  dropbox = callPackage ../applications/networking/dropbox { };
+  dropbox = callPackage ../applications/networking/dropbox {
+    qt5 = qt54;
+  };
 
   dropbox-cli = callPackage ../applications/networking/dropbox-cli { };