From 3baa12f28691bb5120e2599939d31033a5ed3a26 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Mon, 27 Jan 2020 10:20:28 +0100 Subject: litecoin: support qt5 --- pkgs/applications/blockchains/litecoin.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'pkgs/applications/blockchains') diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix index 403c559ee2f1..b2c905fa6027 100644 --- a/pkgs/applications/blockchains/litecoin.nix +++ b/pkgs/applications/blockchains/litecoin.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchFromGitHub +{ stdenv, mkDerivation, fetchFromGitHub , pkgconfig, autoreconfHook , openssl, db48, boost, zlib, miniupnpc -, glib, protobuf, utillinux, qt4, qrencode +, glib, protobuf, utillinux, qrencode , AppKit , withGui ? true, libevent +, qtbase, qttools }: with stdenv.lib; -stdenv.mkDerivation rec { +mkDerivation rec { name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version; version = "0.17.1"; @@ -24,10 +25,12 @@ stdenv.mkDerivation rec { buildInputs = [ openssl db48 boost zlib miniupnpc glib protobuf utillinux libevent ] ++ optionals stdenv.isDarwin [ AppKit ] - ++ optionals withGui [ qt4 qrencode ]; + ++ optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt4" ]; + ++ optionals withGui [ + "--with-gui=qt5" + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; enableParallelBuilding = true; -- cgit 1.4.1 From 910c73e062dc14917753df23e017c3ee6f1a37f3 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Mon, 27 Jan 2020 10:22:31 +0100 Subject: litecoin: add zmq support --- pkgs/applications/blockchains/litecoin.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/blockchains') diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix index b2c905fa6027..470772665413 100644 --- a/pkgs/applications/blockchains/litecoin.nix +++ b/pkgs/applications/blockchains/litecoin.nix @@ -5,6 +5,7 @@ , AppKit , withGui ? true, libevent , qtbase, qttools +, zeromq }: with stdenv.lib; @@ -22,7 +23,7 @@ mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ openssl db48 boost zlib + buildInputs = [ openssl db48 boost zlib zeromq miniupnpc glib protobuf utillinux libevent ] ++ optionals stdenv.isDarwin [ AppKit ] ++ optionals withGui [ qtbase qttools qrencode ]; -- cgit 1.4.1