From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJjMb-00050p-K4 for guix-patches@gnu.org; Tue, 28 Nov 2017 12:08:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eJjMZ-0002yA-IF for guix-patches@gnu.org; Tue, 28 Nov 2017 12:08:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:54458) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eJjMZ-0002y5-Eg for guix-patches@gnu.org; Tue, 28 Nov 2017 12:08:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eJjMZ-0001mF-89 for guix-patches@gnu.org; Tue, 28 Nov 2017 12:08:03 -0500 Subject: [bug#29392] [PATCH 04/11] gnu: gpick: Use scons-build-system. Resent-Message-ID: From: Arun Isaac Date: Tue, 28 Nov 2017 22:36:44 +0530 Message-Id: <20171128170651.6136-5-arunisaac@systemreboot.net> In-Reply-To: <20171128170651.6136-1-arunisaac@systemreboot.net> References: <20171128170651.6136-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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/image.scm (gpick): Switch to scons-build-system. --- gnu/packages/image.scm | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 0e1f02556..dfba83a21 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice ;;; Copyright © 2016 Eric Bavier -;;; Copyright © 2016 Arun Isaac +;;; Copyright © 2016, 2017 Arun Isaac ;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Hartmut Goebel @@ -67,6 +67,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system python) #:use-module (guix build-system r) + #:use-module (guix build-system scons) #:use-module (srfi srfi-1)) (define-public libpng @@ -1204,33 +1205,26 @@ medical image data, e.g. magnetic resonance image (MRI) and functional MRI (sha256 (base32 "0mxvxk15xhk2i5vfavjhnkk4j3bnii0gpf8di14rlbpq070hd5rs")))) - (build-system python-build-system) + (build-system scons-build-system) (native-inputs `(("boost" ,boost) ("gettext" ,gnu-gettext) - ("pkg-config" ,pkg-config) - ("scons" ,scons))) + ("pkg-config" ,pkg-config))) (inputs `(("expat" ,expat) ("gtk2" ,gtk+-2) ("lua" ,lua-5.2))) (arguments `(#:tests? #f + #:scons ,scons-python2 + #:scons-flags (list (string-append "DESTDIR=" %output)) #:phases (modify-phases %standard-phases (add-before 'build 'fix-lua-reference (lambda _ (substitute* "SConscript" (("lua5.2") "lua-5.2")) - #t)) - (replace 'build - (lambda _ - (zero? (system* "scons")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((dest (assoc-ref outputs "out"))) - (zero? (system* "scons" "install" - (string-append "DESTDIR=" dest))))))))) + #t))))) (home-page "http://www.gpick.org/") (synopsis "Color picker") (description "Gpick is an advanced color picker and palette editing tool.") -- 2.15.0