dropbox: use vendored Qt 5 libraries

This commit is contained in:
Thomas Tuegel 2017-03-25 10:14:51 -05:00
parent e6dc95697a
commit 9125bab708
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
2 changed files with 9 additions and 17 deletions

View file

@ -3,7 +3,6 @@
, 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
@ -44,8 +43,6 @@ 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 {
@ -73,6 +70,8 @@ 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}/"
@ -81,19 +80,6 @@ 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
@ -106,9 +92,13 @@ 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/'
@ -148,6 +138,8 @@ in stdenv.mkDerivation {
done
paxmark m $out/${appdir}/dropbox
runHook postFixup
'';
meta = {

View file

@ -15394,7 +15394,7 @@ with pkgs;
bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { };
bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { };
dropbox = libsForQt5.callPackage ../applications/networking/dropbox { };
dropbox = callPackage ../applications/networking/dropbox { };
dropbox-cli = callPackage ../applications/networking/dropbox-cli { };