summary refs log tree commit diff
path: root/pkgs/applications/networking/dropbox
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-03-29 07:33:46 -0500
committerThomas Tuegel <ttuegel@mailbox.org>2017-03-29 07:33:46 -0500
commitc076b9326ffa66ef125d64cefe3ba68dac3d8399 (patch)
tree7dcab2db456ce925bdf34861b69ad58be79d35d7 /pkgs/applications/networking/dropbox
parent3c96a536086ad4af2291eee1f1f7fb866eca39d0 (diff)
downloadnixlib-c076b9326ffa66ef125d64cefe3ba68dac3d8399.tar
nixlib-c076b9326ffa66ef125d64cefe3ba68dac3d8399.tar.gz
nixlib-c076b9326ffa66ef125d64cefe3ba68dac3d8399.tar.bz2
nixlib-c076b9326ffa66ef125d64cefe3ba68dac3d8399.tar.lz
nixlib-c076b9326ffa66ef125d64cefe3ba68dac3d8399.tar.xz
nixlib-c076b9326ffa66ef125d64cefe3ba68dac3d8399.tar.zst
nixlib-c076b9326ffa66ef125d64cefe3ba68dac3d8399.zip
dropbox: remove more useless vendored libraries
Diffstat (limited to 'pkgs/applications/networking/dropbox')
-rw-r--r--pkgs/applications/networking/dropbox/default.nix17
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 9e1469d95b28..c262d9014430 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -76,23 +76,16 @@ in stdenv.mkDerivation {
     mkdir -p "$out/${appdir}"
     cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/"
 
+    # Vendored libraries interact poorly with our graphics drivers
     rm "$out/${appdir}/libdrm.so.2"
     rm "$out/${appdir}/libffi.so.6"
     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"
+    # Cannot use vendored Qt libraries due to problem with xkbcommon
+    rm "$out/${appdir}/"libQt5*.so.5
+    rm "$out/${appdir}/qt.conf"
+    rm -fr "$out/${appdir}/plugins"
 
     mkdir -p "$out/share/applications"
     cp "${desktopItem}/share/applications/"* $out/share/applications