diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-07-06 11:34:43 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-07-06 11:34:43 -0500 |
commit | 05b3749bb2a8588746a5b13770145d4aea73e51e (patch) | |
tree | ae9e746cd588674ca660d25321398bb6d5e4d945 /pkgs/applications/networking/dropbox/default.nix | |
parent | 0d5be595a7c707be1cedebf1f14a47cafdf0a3f4 (diff) | |
download | nixpkgs-05b3749bb2a8588746a5b13770145d4aea73e51e.tar nixpkgs-05b3749bb2a8588746a5b13770145d4aea73e51e.tar.gz nixpkgs-05b3749bb2a8588746a5b13770145d4aea73e51e.tar.bz2 nixpkgs-05b3749bb2a8588746a5b13770145d4aea73e51e.tar.lz nixpkgs-05b3749bb2a8588746a5b13770145d4aea73e51e.tar.xz nixpkgs-05b3749bb2a8588746a5b13770145d4aea73e51e.tar.zst nixpkgs-05b3749bb2a8588746a5b13770145d4aea73e51e.zip |
dropbox: don't use bundled Qt libraries
Fixes #16744.
Diffstat (limited to 'pkgs/applications/networking/dropbox/default.nix')
-rw-r--r-- | pkgs/applications/networking/dropbox/default.nix | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 30101231611..e0fa18dcb42 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -3,6 +3,7 @@ , libdrm, libffi, libICE, libSM , libX11, libXcomposite, libXext, libXmu, libXrender, libxcb , libxml2, libxslt, ncurses, zlib +, qtbase, qtdeclarative, qtquick1, qtwebkit }: # this package contains the daemon version of dropbox @@ -20,7 +21,8 @@ # them with our own. 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"; sha256 = { @@ -42,6 +44,8 @@ let dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt ncurses zlib + + qtbase qtdeclarative qtquick1 qtwebkit ]; desktopItem = makeDesktopItem { @@ -77,6 +81,19 @@ in stdenv.mkDerivation { rm "$out/${appdir}/libGL.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" cp "${desktopItem}/share/applications/"* $out/share/applications |