diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2020-01-27 10:20:28 +0100 |
|---|---|---|
| committer | Marek Mahut <marek.mahut@gmail.com> | 2020-01-27 10:20:28 +0100 |
| commit | 3baa12f28691bb5120e2599939d31033a5ed3a26 (patch) | |
| tree | 5fb52befdc19e0e67318bf9a28c2e092f08c04f0 | |
| parent | 61dbbe4121b8a6d3058e38c2d948b2ff143f0e5b (diff) | |
| download | nixpkgs-3baa12f28691bb5120e2599939d31033a5ed3a26.tar nixpkgs-3baa12f28691bb5120e2599939d31033a5ed3a26.tar.gz nixpkgs-3baa12f28691bb5120e2599939d31033a5ed3a26.tar.bz2 nixpkgs-3baa12f28691bb5120e2599939d31033a5ed3a26.tar.lz nixpkgs-3baa12f28691bb5120e2599939d31033a5ed3a26.tar.xz nixpkgs-3baa12f28691bb5120e2599939d31033a5ed3a26.tar.zst nixpkgs-3baa12f28691bb5120e2599939d31033a5ed3a26.zip | |
litecoin: support qt5
| -rw-r--r-- | pkgs/applications/blockchains/litecoin.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix index 403c559ee2f..b2c905fa602 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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa84cd785fb..ccbb93f535d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22719,7 +22719,7 @@ in ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; - litecoin = callPackage ../applications/blockchains/litecoin.nix { + litecoin = libsForQt5.callPackage ../applications/blockchains/litecoin.nix { inherit (darwin.apple_sdk.frameworks) AppKit; }; litecoind = litecoin.override { withGui = false; }; |