From 136ff9a2472506e02876ab04795a14b8e9f06eac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Jul 2018 16:03:59 +0300 Subject: gnu: monero: Use git-file-name. * gnu/packages/finance.scm (monero)[source]: Rename the downloaded source using 'git-file-name'. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/finance.scm') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 3ddaa76a4e..c20880b14b 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016 Andreas Enge -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Carlo Zancanaro @@ -376,7 +376,7 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch (uri (git-reference (url "https://github.com/monero-project/monero") (commit (string-append "v" version)))) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (git-file-name name version)) (patches (search-patches "monero-use-system-miniupnpc.patch")) (sha256 (base32 -- cgit 1.4.1 From 398a96a2864aa3101adfc7bbd56e4ea980fa3798 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 29 Jul 2018 16:05:53 +0300 Subject: gnu: monero-gui: Use git-file-name. * gnu/packages/finance.scm (monero-gui)[source]: Rename the downloaded source using 'git-file-name'. --- gnu/packages/finance.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/finance.scm') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index c20880b14b..69209e9a63 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -470,7 +470,7 @@ Monero command line client and daemon.") (uri (git-reference (url "https://github.com/monero-project/monero-gui") (commit (string-append "v" version)))) - (file-name (string-append name "-" version ".tar.gz")) + (file-name (git-file-name name version)) (sha256 (base32 "1cnrkwh7kp64lnzz1xfmkf1mhsgm5gls292gpqai3jr8jydpkahl")))) -- cgit 1.4.1 From 6915d20f05363f61cef9c4ed7ebda3fe5a19325d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Jul 2018 09:43:15 +0300 Subject: gnu: monero-gui: Build with modular qt. * gnu/packages/finance.scm (monero-gui)[inputs]: Remove qt, add qtbase, qtdeclarative, qtgraphicaleffects, qtquickcontrols. [native-inputs]: Add qttools. [arguments]: Add a custom phase to patch the absolute file-name of lrelease and lupdate. Add a custom phase to wrap the executable with QT environmental variables. --- gnu/packages/finance.scm | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) (limited to 'gnu/packages/finance.scm') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 69209e9a63..fd2a5af0cb 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -478,12 +478,16 @@ Monero command line client and daemon.") (native-inputs `(("doxygen" ,doxygen) ("graphviz" ,graphviz) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("qttools" ,qttools))) (inputs `(("boost" ,boost) ("libunwind" ,libunwind) ("openssl" ,openssl) - ("qt" ,qt) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtquickcontrols" ,qtquickcontrols) ("readline" ,readline) ("unbound" ,unbound))) (propagated-inputs @@ -518,6 +522,15 @@ Monero command line client and daemon.") (string-append "\""(assoc-ref inputs "monero") "/bin/monerod"))) #t)) + (add-after 'fix-monerod-path 'fix-qt-paths + (lambda* (#:key inputs #:allow-other-keys) + (let* ((qttools (assoc-ref inputs "qttools")) + (lrelease (string-append qttools "/bin/lrelease")) + (lupdate (string-append qttools "/bin/lupdate"))) + (substitute* "monero-wallet-gui.pro" + (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") lrelease) + (("\\$\\$\\[QT_INSTALL_BINS\\]/lupdate") lupdate)) + #t))) (replace 'build (lambda _ (invoke "./build.sh"))) @@ -529,7 +542,23 @@ Monero command line client and daemon.") #t)) (add-before 'install 'change-dir (lambda _ - (chdir "build")))))) + (chdir "build"))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/monero-wallet-gui") + `("QT_PLUGIN_PATH" ":" prefix + ,(map (lambda (label) + (string-append (assoc-ref inputs label) + "/lib/qt5/plugins")) + '("qtbase" "qtdeclarative"))) + `("QML2_IMPORT_PATH" ":" prefix + ,(map (lambda (label) + (string-append (assoc-ref inputs label) + "/lib/qt5/qml")) + '("qtdeclarative" "qtgraphicaleffects" + "qtquickcontrols")))) + #t)))))) (home-page "https://getmonero.org/") (synopsis "Graphical user interface for the Monero currency") (description -- cgit 1.4.1