public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65787 from rawkode/feature/qtwrap-nheko

Browse Source 
nheko: use qt5's mkDerivation
This commit is contained in:
worldofpeace 2019-08-09 13:12:21 -04:00 committed by GitHub
commit ededb06332
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/instant-messengers/nheko/default.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, cmake, cmark, lmdb, qt5, qtmacextras, mtxclient , cmake, cmark, lmdb, mkDerivation, qtbase, qtmacextras
, boost, spdlog, olm, pkgconfig, nlohmann_json , qtmultimedia, qttools, mtxclient, boost, spdlog, olm, pkgconfig
, nlohmann_json
}: }:
# These hashes and revisions are based on those from here: # These hashes and revisions are based on those from here:
@ -20,7 +21,7 @@ let
sha256 = "1whsc5cybf9rmgyaj6qjji03fv5jbgcgygp956s3835b9f9cjg1n"; sha256 = "1whsc5cybf9rmgyaj6qjji03fv5jbgcgygp956s3835b9f9cjg1n";
}; };
in in
stdenv.mkDerivation rec { mkDerivation rec {
name = "nheko-${version}"; name = "nheko-${version}";
version = "0.6.4"; version = "0.6.4";
@ -63,7 +64,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
mtxclient olm boost lmdb spdlog cmark mtxclient olm boost lmdb spdlog cmark
qt5.qtbase qt5.qtmultimedia qt5.qttools qtbase qtmultimedia qttools
] ++ lib.optional stdenv.isDarwin qtmacextras; ] ++ lib.optional stdenv.isDarwin qtmacextras;
enableParallelBuilding = true; enableParallelBuilding = true;