From ba977fa6127f8e062ea847791178024266ad963a Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Wed, 2 Oct 2019 04:44:06 +0000 Subject: [PATCH] electrum-nmc: Don't include qrcode if GUI disabled --- projects/electrum-nmc/build | 6 +++++- projects/electrum-nmc/config | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/electrum-nmc/build b/projects/electrum-nmc/build index d6d1e4f..90a9206 100644 --- a/projects/electrum-nmc/build +++ b/projects/electrum-nmc/build @@ -10,7 +10,7 @@ cd /var/tmp/build/[% project %]/[% project %]-* mkdir packages cd packages -[% FOREACH dep = ['aiohttp', 'aiohttp_socks', 'aiorpcx', 'async_timeout', 'attr', 'certifi', 'chardet', 'colorama', 'dns', 'ecdsa', 'idna', 'idna_ssl', 'jsonrpclib', 'multidict', 'pyaes', 'qrcode', 'six', 'typing_extensions', 'yarl'] -%] +[% FOREACH dep = ['aiohttp', 'aiohttp_socks', 'aiorpcx', 'async_timeout', 'attr', 'certifi', 'chardet', 'colorama', 'dns', 'ecdsa', 'idna', 'idna_ssl', 'jsonrpclib', 'multidict', 'pyaes', 'six', 'typing_extensions', 'yarl'] -%] tar -C . -xf $rootdir/[% c('input_files_by_name/' _ dep) %] [% END -%] @@ -18,6 +18,10 @@ cd packages tar -C . -xf $rootdir/[% c('input_files_by_name/' _ 'qdarkstyle') %] [% END %] +[% IF c("var/enable_qt") || c("var/enable_kivy") %] + tar -C . -xf $rootdir/[% c('input_files_by_name/' _ 'qrcode') %] +[% END %] + tar -C . -xf $rootdir/[% c('input_files_by_name/protobuf') %]/python-protobuf.tar.gz cd ../ diff --git a/projects/electrum-nmc/config b/projects/electrum-nmc/config index 49e0f5f..e5a3fc6 100644 --- a/projects/electrum-nmc/config +++ b/projects/electrum-nmc/config @@ -52,6 +52,7 @@ input_files: enable: '[% c("var/enable_qt") %]' - project: qrcode name: qrcode + enable: '[% c("var/enable_qt") || c("var/enable_kivy") %]' - project: six name: six - project: typing_extensions