mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 21:21:06 +00:00
Merge remote-tracking branch 'upstream/master' into openssl-1.1
This commit is contained in:
parent
f4fc845e5b
commit
bbf133d07e
|
@ -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";
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub
|
||||
{ stdenv, fetchFromGitHub, mkDerivation
|
||||
, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools
|
||||
, qtconnectivity, qtcharts
|
||||
, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper
|
||||
|
|
Loading…
Reference in a new issue