dropbox: don't use bundled Qt libraries

Fixes #16744.
This commit is contained in:
Thomas Tuegel 2016-07-06 11:34:43 -05:00
parent 0d5be595a7
commit 05b3749bb2

View File

@ -3,6 +3,7 @@
, libdrm, libffi, libICE, libSM , libdrm, libffi, libICE, libSM
, libX11, libXcomposite, libXext, libXmu, libXrender, libxcb , libX11, libXcomposite, libXext, libXmu, libXrender, libxcb
, libxml2, libxslt, ncurses, zlib , libxml2, libxslt, ncurses, zlib
, qtbase, qtdeclarative, qtquick1, qtwebkit
}: }:
# this package contains the daemon version of dropbox # this package contains the daemon version of dropbox
@ -20,7 +21,8 @@
# them with our own. # them with our own.
let let
# NOTE: When updating, please also update in current stable, as older versions stop working # NOTE: When updating, please also update in current stable,
# as older versions stop working
version = "4.4.29"; version = "4.4.29";
sha256 = sha256 =
{ {
@ -42,6 +44,8 @@ let
dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM
libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt
ncurses zlib ncurses zlib
qtbase qtdeclarative qtquick1 qtwebkit
]; ];
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -77,6 +81,19 @@ in stdenv.mkDerivation {
rm "$out/${appdir}/libGL.so.1" rm "$out/${appdir}/libGL.so.1"
rm "$out/${appdir}/libX11-xcb.so.1" rm "$out/${appdir}/libX11-xcb.so.1"
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}/libQt5XcbQpa.so.5"
mkdir -p "$out/share/applications" mkdir -p "$out/share/applications"
cp "${desktopItem}/share/applications/"* $out/share/applications cp "${desktopItem}/share/applications/"* $out/share/applications