From b6998a786b88352f0c49b2069d129d87c3e8da1c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 20 Aug 2019 23:47:37 +0200 Subject: bitcoin-unlimited: 1.0.3.0 -> 1.6.0.1 fixes openssl 1.1 compat --- pkgs/applications/altcoins/bitcoin-unlimited.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'pkgs/applications/altcoins/bitcoin-unlimited.nix') diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix index 13ec55bb589da..dad3101e4e0dc 100644 --- a/pkgs/applications/altcoins/bitcoin-unlimited.nix +++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent -, withGui +, zlib, miniupnpc, utillinux, protobuf, qrencode, libevent, python3 +, withGui, wrapQtAppsHook, qtbase, qttools , Foundation, ApplicationServices, AppKit }: with stdenv.lib; @@ -8,27 +8,26 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; - version = "1.0.3.0"; + version = "1.6.0.1"; src = fetchFromGitHub { owner = "bitcoinunlimited"; repo = "bitcoinunlimited"; - rev = "v${version}"; - sha256 = "0l02a7h502msrp4c02wgm7f3159ap8l61k4890vas99gq7ywxkcx"; + rev = "bucash${version}"; + sha256 = "0f0mnal4jf8xdj7w5m4rdlcqkrkbpxi88c006m5k45lmjmj141zr"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkgconfig autoreconfHook python3 ] + ++ optionals withGui [ wrapQtAppsHook qttools ]; buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf libevent ] - ++ optionals withGui [ qt4 qrencode ] + ++ optionals withGui [ qtbase qttools qrencode ] ++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; - patches = [ - ./bitcoin-unlimited-const-comparators.patch - ]; - 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; meta = { -- cgit 1.4.1 From bbf133d07e999bebb64df8f145c45bdd839ced0c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 21 Aug 2019 14:52:07 +0200 Subject: Merge remote-tracking branch 'upstream/master' into openssl-1.1 --- pkgs/applications/altcoins/bitcoin-unlimited.nix | 3 +-- pkgs/applications/altcoins/dogecoin.nix | 2 +- pkgs/applications/misc/golden-cheetah/default.nix | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/altcoins/bitcoin-unlimited.nix') diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix index dad3101e4e0dc..a75b20b39109f 100644 --- a/pkgs/applications/altcoins/bitcoin-unlimited.nix +++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix @@ -1,12 +1,11 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, utillinux, protobuf, qrencode, libevent, python3 -, withGui, wrapQtAppsHook, qtbase, qttools +, withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null , Foundation, ApplicationServices, AppKit }: with stdenv.lib; stdenv.mkDerivation rec { - name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; version = "1.6.0.1"; diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index 81839d70bbd9c..e5f149a0efe76 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -2,7 +2,7 @@ , pkgconfig, autoreconfHook , db5, openssl, boost, zlib, miniupnpc, libevent , protobuf, utillinux, qt4, qrencode -, withGui, libevent }: +, withGui }: with stdenv.lib; stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 0fb8f3ef343e2..0af84365158e5 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, mkDerivation , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools , qtconnectivity, qtcharts , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper -- cgit 1.4.1