From 039b9ab8b97dfd2b9303a6a4493b5001cbe6d146 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 3 Jan 2018 14:27:09 -0600 Subject: [PATCH] mendeley: Use libsForQt56.callPackage, NFCI --- pkgs/applications/office/mendeley/default.nix | 22 ++++++++++++------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 12ad8431cac..c2b6dc710ba 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -15,7 +15,13 @@ , orc , nss , nspr -, qt5 +, qtbase +, qtsvg +, qtdeclarative +, qtwebchannel +, qtquickcontrols +, qtwebkit +, qtwebengine , sqlite , xorg , xlibs @@ -47,13 +53,13 @@ let else "11z65mj1a2rw6cwfarl8r1vzpcz4ww5mgvd5fyv31l60mbmnqkap"; deps = [ - qt5.qtbase - qt5.qtsvg - qt5.qtdeclarative - qt5.qtwebchannel - qt5.qtquickcontrols - qt5.qtwebkit - qt5.qtwebengine + qtbase + qtsvg + qtdeclarative + qtwebchannel + qtquickcontrols + qtwebkit + qtwebengine alsaLib dbus freetype diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10a5307a5b8..ea2a5a90697 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15896,8 +15896,7 @@ with pkgs; mcomix = callPackage ../applications/graphics/mcomix { }; - mendeley = callPackage ../applications/office/mendeley { - qt5 = qt56; + mendeley = libsForQt56.callPackage ../applications/office/mendeley { gconf = pkgs.gnome2.GConf; };