Merge branch 'dropbox'

pkgs/applications/networking/dropbox/default.nix

@@ -1,7 +1,8 @@
-{ stdenv, fetchurl, makeDesktopItem, patchelf
+{ stdenv, fetchurl, makeDesktopItem, patchelf, makeWrapper
-, dbus_libs, gcc, glib, libdrm, libffi, libICE, libSM
+, dbus_libs, fontconfig, freetype, gcc, glib
-, libX11, libXmu, ncurses, popt, qt5, zlib
+, libdrm, libffi, libICE, libSM
-, qtbase, qtdeclarative, qtwebkit, makeQtWrapper
+, libX11, libXcomposite, libXext, libXmu, libXrender, libxcb
+, libxml2, libxslt, ncurses, zlib
 }:
 
 # this package contains the daemon version of dropbox
@@ -38,8 +39,9 @@ let
 
   ldpath = stdenv.lib.makeLibraryPath
     [
-      dbus_libs gcc.cc glib libdrm libffi libICE libSM libX11 libXmu
+      dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM
-      ncurses popt qtbase qtdeclarative qtwebkit zlib
+      libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt
+      ncurses zlib
     ];
 
   desktopItem = makeDesktopItem {
@@ -62,7 +64,7 @@ in stdenv.mkDerivation {
 
   sourceRoot = ".dropbox-dist";
 
-  nativeBuildInputs = [ makeQtWrapper patchelf ];
+  nativeBuildInputs = [ makeWrapper patchelf ];
   dontPatchELF = true; # patchelf invoked explicitly below
   dontStrip = true; # already done
 
@@ -72,28 +74,9 @@ in stdenv.mkDerivation {
 
     rm "$out/${appdir}/libdrm.so.2"
     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"
-
     mkdir -p "$out/share/applications"
     cp "${desktopItem}/share/applications/"* $out/share/applications
 
@@ -102,7 +85,7 @@ in stdenv.mkDerivation {
 
     mkdir -p "$out/bin"
     RPATH="${ldpath}:$out/${appdir}"
-    makeQtWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
+    makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
       --prefix LD_LIBRARY_PATH : "$RPATH"
   '';