diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-25 10:14:51 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-25 10:14:51 -0500 |
commit | 9125bab708fcacbfbf7b77e44935c8ce254de3b9 (patch) | |
tree | 839351524759a53f9f42f55d4ff62e54079babdc /pkgs/applications/networking/dropbox | |
parent | e6dc95697a3cf633e6d700e19470b19e61150715 (diff) | |
download | nixlib-9125bab708fcacbfbf7b77e44935c8ce254de3b9.tar nixlib-9125bab708fcacbfbf7b77e44935c8ce254de3b9.tar.gz nixlib-9125bab708fcacbfbf7b77e44935c8ce254de3b9.tar.bz2 nixlib-9125bab708fcacbfbf7b77e44935c8ce254de3b9.tar.lz nixlib-9125bab708fcacbfbf7b77e44935c8ce254de3b9.tar.xz nixlib-9125bab708fcacbfbf7b77e44935c8ce254de3b9.tar.zst nixlib-9125bab708fcacbfbf7b77e44935c8ce254de3b9.zip |
dropbox: use vendored Qt 5 libraries
Diffstat (limited to 'pkgs/applications/networking/dropbox')
-rw-r--r-- | pkgs/applications/networking/dropbox/default.nix | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 3721f7ed4af6..6d3c34b48d59 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -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 = { |