diff options
| author | lassulus <lassulus@lassul.us> | 2017-10-04 00:48:58 +0200 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2017-10-07 09:48:58 -0500 |
| commit | 9c5ef048c42a8b9de16d076e98589681f80d9c15 (patch) | |
| tree | 5f2294dadfd74f7cec0ebe71c470c3efc6b5d404 /pkgs/applications/altcoins | |
| parent | 30524ca8609731267b9cf332ac74c3b2edd6b003 (diff) | |
| download | nixlib-9c5ef048c42a8b9de16d076e98589681f80d9c15.tar nixlib-9c5ef048c42a8b9de16d076e98589681f80d9c15.tar.gz nixlib-9c5ef048c42a8b9de16d076e98589681f80d9c15.tar.bz2 nixlib-9c5ef048c42a8b9de16d076e98589681f80d9c15.tar.lz nixlib-9c5ef048c42a8b9de16d076e98589681f80d9c15.tar.xz nixlib-9c5ef048c42a8b9de16d076e98589681f80d9c15.tar.zst nixlib-9c5ef048c42a8b9de16d076e98589681f80d9c15.zip | |
bitcoin-classic: build with qt5
fixes #30075
Diffstat (limited to 'pkgs/applications/altcoins')
| -rw-r--r-- | pkgs/applications/altcoins/bitcoin-abc.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/altcoins/bitcoin-classic.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/altcoins/default.nix | 6 |
3 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix index d3800062b119..665b88bfd328 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, qt5, utillinux, protobuf, qrencode, libevent +, zlib, miniupnpc, qtbase, qttools, utillinux, protobuf, qrencode, libevent , withGui }: with stdenv.lib; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf libevent ] - ++ optionals withGui [ qt5.qtbase qt5.qttools qrencode ]; + ++ optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt5" ]; diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix index d2878a17fb3a..471e5a687afa 100644 --- a/pkgs/applications/altcoins/bitcoin-classic.nix +++ b/pkgs/applications/altcoins/bitcoin-classic.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent +, zlib, miniupnpc, qtbase, qttools, utillinux, protobuf, qrencode, libevent , withGui }: with stdenv.lib; @@ -16,13 +16,15 @@ stdenv.mkDerivation rec { sha256 = "129gkg035gv7zmc463jl2spvdh0fl4q8v4jdaslfnp34hbwi1p07"; }; + patches = [ ./fix-bitcoin-qt-build.patch ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf libevent ] - ++ 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" ]; meta = { description = "Peer-to-peer electronic cash system (Classic client)"; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 395a440690b1..0264ce397762 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,17 +1,17 @@ -{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages, darwin }: +{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages, darwin, libsForQt5 }: rec { bitcoin = callPackage ./bitcoin.nix { withGui = true; }; bitcoind = callPackage ./bitcoin.nix { withGui = false; }; - bitcoin-abc = callPackage ./bitcoin-abc.nix { withGui = true; }; + bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; }; bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; }; bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; - bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; }; + bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { withGui = true; }; bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; }; bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; }; |