diff options
| author | Joerg Thalheim <joerg@thalheim.io> | 2017-09-27 23:13:31 +0100 |
|---|---|---|
| committer | Joerg Thalheim <joerg@thalheim.io> | 2017-09-28 00:22:06 +0100 |
| commit | 589cff44bcfc7d69733b0b0af2f403b630388604 (patch) | |
| tree | 67a3d829fc903a00f984a2ca5f9315856bff0a4c | |
| parent | d82578addb1dee832c7758dbd4a3fbbf30c902b6 (diff) | |
| download | nixlib-589cff44bcfc7d69733b0b0af2f403b630388604.tar nixlib-589cff44bcfc7d69733b0b0af2f403b630388604.tar.gz nixlib-589cff44bcfc7d69733b0b0af2f403b630388604.tar.bz2 nixlib-589cff44bcfc7d69733b0b0af2f403b630388604.tar.lz nixlib-589cff44bcfc7d69733b0b0af2f403b630388604.tar.xz nixlib-589cff44bcfc7d69733b0b0af2f403b630388604.tar.zst nixlib-589cff44bcfc7d69733b0b0af2f403b630388604.zip | |
bitcoin-abc: build against qt5
| -rw-r--r-- | pkgs/applications/altcoins/bitcoin-abc.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/altcoins/fix-bitcoin-qt-build.patch | 15 |
2 files changed, 20 insertions, 3 deletions
diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index a14cccd2fdc7..d3800062b119 100644 --- a/pkgs/applications/altcoins/bitcoin-abc.nix +++ b/pkgs/applications/altcoins/bitcoin-abc.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent +, zlib, miniupnpc, qt5, utillinux, protobuf, qrencode, libevent , withGui }: with stdenv.lib; @@ -16,13 +16,15 @@ stdenv.mkDerivation rec { sha256 = "1fygn6cc99iasg5g5jyps5ps873hfnn4ln4hsmcwlwiqd591qxyv"; }; + patches = [ ./fix-bitcoin-qt-build.patch ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf libevent ] - ++ optionals withGui [ qt4 qrencode ]; + ++ optionals withGui [ qt5.qtbase qt5.qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt4" ]; + ++ optionals withGui [ "--with-gui=qt5" ]; meta = { description = "Peer-to-peer electronic cash system (Cash client)"; diff --git a/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch b/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch new file mode 100644 index 000000000000..cbbfd85fe5bf --- /dev/null +++ b/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch @@ -0,0 +1,15 @@ +--- bitcoin-abc-v0.15.0-src/build-aux/m4/bitcoin_qt.m4 1970-01-01 01:00:01.000000000 +0100 ++++ bitcoin-abc-v0.15.0-src.org/build-aux/m4/bitcoin_qt.m4 2017-09-27 23:38:44.748384197 +0100 +@@ -35,11 +35,7 @@ + dnl Output: $1 is set to the path of $2 if found. $2 are searched in order. + AC_DEFUN([BITCOIN_QT_PATH_PROGS],[ + BITCOIN_QT_CHECK([ +- if test "x$3" != "x"; then +- AC_PATH_PROGS($1,$2,,$3) +- else +- AC_PATH_PROGS($1,$2) +- fi ++ AC_PATH_PROGS($1,$2) + if test "x$$1" = "x" && test "x$4" != "xyes"; then + BITCOIN_QT_FAIL([$1 not found]) + fi |