From 43380f49b4ce507afebc4df5ad1894c392330a23 Mon Sep 17 00:00:00 2001 From: David McKay Date: Fri, 2 Aug 2019 13:18:57 +0100 Subject: [PATCH] nheko: use qt5's mkDerivation See #65399 --- .../networking/instant-messengers/nheko/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 9b1939f00516..d337c62ea094 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub -, cmake, cmark, lmdb, qt5, qtmacextras, mtxclient -, boost, spdlog, olm, pkgconfig, nlohmann_json +, cmake, cmark, lmdb, mkDerivation, qtbase, qtmacextras +, qtmultimedia, qttools, mtxclient, boost, spdlog, olm, pkgconfig +, nlohmann_json }: # These hashes and revisions are based on those from here: @@ -20,7 +21,7 @@ let sha256 = "1whsc5cybf9rmgyaj6qjji03fv5jbgcgygp956s3835b9f9cjg1n"; }; in -stdenv.mkDerivation rec { +mkDerivation rec { name = "nheko-${version}"; version = "0.6.4"; @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ mtxclient olm boost lmdb spdlog cmark - qt5.qtbase qt5.qtmultimedia qt5.qttools + qtbase qtmultimedia qttools ] ++ lib.optional stdenv.isDarwin qtmacextras; enableParallelBuilding = true;