From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJjMg-000560-Ro for guix-patches@gnu.org; Tue, 28 Nov 2017 12:08:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eJjMc-00030z-Rm for guix-patches@gnu.org; Tue, 28 Nov 2017 12:08:10 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:54461) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eJjMc-00030q-OC for guix-patches@gnu.org; Tue, 28 Nov 2017 12:08:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eJjMc-0001me-Iv for guix-patches@gnu.org; Tue, 28 Nov 2017 12:08:06 -0500 Subject: [bug#29392] [PATCH 03/11] gnu: linuxdcpp: Use scons-build-system. Resent-Message-ID: From: Arun Isaac Date: Tue, 28 Nov 2017 22:36:43 +0530 Message-Id: <20171128170651.6136-4-arunisaac@systemreboot.net> In-Reply-To: <20171128170651.6136-1-arunisaac@systemreboot.net> References: <20171128170651.6136-1-arunisaac@systemreboot.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29392@debbugs.gnu.org * gnu/packages/direct-connect.scm (linuxdcpp): Switch to scons-build-system. --- gnu/packages/direct-connect.scm | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/gnu/packages/direct-connect.scm b/gnu/packages/direct-connect.scm index 6796bf3bc..ac0a49052 100644 --- a/gnu/packages/direct-connect.scm +++ b/gnu/packages/direct-connect.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages direct-connect) - #:use-module (guix build-system python) + #:use-module (guix build-system scons) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) @@ -44,23 +44,11 @@ (sha256 (base32 "12i92hirmwryl1qy0n3jfrpziwzb82f61xca9jcjwyilx502f0b6")))) - (build-system python-build-system) + (build-system scons-build-system) (arguments - `(#:python ,python-2 - #:tests? #f ; no tests - #:phases - ;; TODO: Add scons-build-system and use it here. - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p out) - (zero? (system* "scons" (string-append "PREFIX=" out) - "-j" (number->string (parallel-job-count))))))) - (replace 'install - (lambda _ - (zero? (system* "scons" "install"))))))) + `(#:scons ,scons-python2 + #:scons-flags (list (string-append "PREFIX=" %output)) + #:tests? #f)) ; no tests (inputs `(("boost" ,boost) ("bzip2" ,bzip2) @@ -71,8 +59,7 @@ (native-inputs `(("bazaar" ,bazaar) ("gettext-minimal" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("scons" ,scons))) + ("pkg-config" ,pkg-config))) (home-page "https://launchpad.net/linuxdcpp/") (synopsis "Direct Connect client") (description "LinuxDC++ is a Direct Connect (DC) client. Direct Connect -- 2.15.0