diff options
| author | Robin Gloster <mail@glob.in> | 2019-08-21 14:52:07 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-08-21 14:52:21 +0200 |
| commit | bbf133d07e999bebb64df8f145c45bdd839ced0c (patch) | |
| tree | 8e15bc7b26e388badd726db0661f7929ccf4f3de /pkgs/applications/altcoins | |
| parent | f4fc845e5b8195b7ef4c7bc6a0e83495ae472d2d (diff) | |
Merge remote-tracking branch 'upstream/master' into openssl-1.1
Diffstat (limited to 'pkgs/applications/altcoins')
| -rw-r--r-- | pkgs/applications/altcoins/bitcoin-unlimited.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/altcoins/dogecoin.nix | 2 |
2 files changed, 2 insertions, 3 deletions
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 { |