diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-29 07:23:27 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-29 07:23:27 -0500 |
commit | 1d8d6d564d18f0d7b4ac659c0c2a6a2084ff546e (patch) | |
tree | 2f16881440ff3286f1804adf8ca4bd75d44883d3 /pkgs/applications/networking | |
parent | b87ebad40e70fc8987de776ea29dd9652995cdcb (diff) | |
download | nixlib-1d8d6d564d18f0d7b4ac659c0c2a6a2084ff546e.tar nixlib-1d8d6d564d18f0d7b4ac659c0c2a6a2084ff546e.tar.gz nixlib-1d8d6d564d18f0d7b4ac659c0c2a6a2084ff546e.tar.bz2 nixlib-1d8d6d564d18f0d7b4ac659c0c2a6a2084ff546e.tar.lz nixlib-1d8d6d564d18f0d7b4ac659c0c2a6a2084ff546e.tar.xz nixlib-1d8d6d564d18f0d7b4ac659c0c2a6a2084ff546e.tar.zst nixlib-1d8d6d564d18f0d7b4ac659c0c2a6a2084ff546e.zip |
Revert "dropbox: use vendored Qt 5 libraries"
This reverts commit 9125bab708fcacbfbf7b77e44935c8ce254de3b9. The vendored libraries have a problem with xkbcommon.
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/dropbox/default.nix | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 028ca2e73977..de419398ad5d 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, qtwebkit }: # this package contains the daemon version of dropbox @@ -43,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 qtwebkit ]; desktopItem = makeDesktopItem { @@ -70,8 +73,6 @@ in stdenv.mkDerivation { dontStrip = true; # already done installPhase = '' - runHook preInstall - mkdir -p "$out/${appdir}" cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/" @@ -80,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 @@ -92,13 +106,9 @@ in stdenv.mkDerivation { --prefix LD_LIBRARY_PATH : "$RPATH" chmod 755 $out/${appdir}/dropbox - - runHook postInstall ''; fixupPhase = '' - runHook preFixup - INTERP=$(cat $NIX_CC/nix-support/dynamic-linker) RPATH="${ldpath}:$out/${appdir}" getType='s/ *Type: *\([A-Z]*\) (.*/\1/' @@ -138,8 +148,6 @@ in stdenv.mkDerivation { done paxmark m $out/${appdir}/dropbox - - runHook postFixup ''; meta = { |