From f998d502fc6efe727659ad883c17acecb9177c0d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 11:14:36 -0500 Subject: [PATCH] dropbox: build with Qt 5.5 --- pkgs/applications/networking/dropbox/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 884b82fe072..f212304b96c 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper , dbus_libs, gcc, glib, libdrm, libffi, libICE, libSM , libX11, libXmu, ncurses, popt, qt5, zlib +, qtbase, qtdeclarative, qtwebkit }: # this package contains the daemon version of dropbox @@ -44,7 +45,7 @@ let ldpath = stdenv.lib.makeSearchPath "lib" [ dbus_libs gcc glib libdrm libffi libICE libSM libX11 - libXmu ncurses popt qt5.base qt5.declarative qt5.webkit + libXmu ncurses popt qtbase qtdeclarative qtwebkit zlib ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a06073c8b20..88a50ec81e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12681,7 +12681,7 @@ let copy-com = callPackage ../applications/networking/copy-com { }; - dropbox = callPackage ../applications/networking/dropbox { }; + dropbox = qt5Libs.callPackage ../applications/networking/dropbox { }; dropbox-cli = callPackage ../applications/networking/dropbox-cli { };