From mboxrd@z Thu Jan 1 00:00:00 1970 From: ericbavier@openmailbox.org Subject: [PATCH 1/2] gnu: newt: Build python bindings. Date: Sun, 1 Nov 2015 11:02:04 -0600 Message-ID: <1446397325-1580-1-git-send-email-ericbavier@openmailbox.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zt0dh-0002YE-Ib for guix-devel@gnu.org; Sun, 01 Nov 2015 16:58:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zt0dd-0002aH-Jh for guix-devel@gnu.org; Sun, 01 Nov 2015 16:58:13 -0500 Received: from smtp3.openmailbox.org ([62.4.1.37]:52396) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zt0dd-0002aA-AY for guix-devel@gnu.org; Sun, 01 Nov 2015 16:58:09 -0500 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org Cc: Eric Bavier From: Eric Bavier * gnu/packages/slang.scm (slang)[outputs]: New field. [arguments]: Add #:make-flags argument. Add 'move-python' phase. --- gnu/packages/slang.scm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/gnu/packages/slang.scm b/gnu/packages/slang.scm index a00fa7b..24ec71e 100644 --- a/gnu/packages/slang.scm +++ b/gnu/packages/slang.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2015 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2015 Mark H Weaver +;;; Copyright =C2=A9 2015 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ (define-module (gnu packages slang) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages readline) @@ -28,7 +30,8 @@ #:use-module (gnu packages fribidi) #:use-module (gnu packages compression) #:use-module (gnu packages image) - #:use-module (gnu packages pcre)) + #:use-module (gnu packages pcre) + #:use-module (gnu packages python)) =20 (define-public slang (package @@ -85,15 +88,22 @@ slsh, which is part of the S-Lang distribution.") (base32 "07n9f2mqsjfj35wx5ldhvl9sqcjqpcl0g4fdd9mawmny9rihw6vp"))= )) (build-system gnu-build-system) + (outputs '("out" "python")) (inputs `(("slang" ,slang) ("popt" ,popt) + ("python" ,python) ("fribidi" ,fribidi))) (arguments `(#:tests? #f ; no test suite #:configure-flags ;; Set the correct RUNPATH in binaries. (list (string-append "LDFLAGS=3D-Wl,-rpath=3D" %output "/lib")) + #:make-flags + ;; configure does not allow us to override this variable from the + ;; command-line. Fortunately, the Makefile does, so provide it h= ere. + (list (string-append "PYTHONVERS=3Dpython" + ,(version-major+minor (package-version pytho= n)))) #:phases (modify-phases %standard-phases (add-after @@ -101,7 +111,17 @@ slsh, which is part of the S-Lang distribution.") (lambda _ (substitute* "po/Makefile" (("/usr/bin/install") "install")) - #t))))) + #t)) + (add-after + 'install 'move-python + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (py (assoc-ref outputs "python")) + (ver ,(version-major+minor (package-version python)))) + (mkdir-p (string-append py "/lib")) + (rename-file (string-append out "/lib/python" ver) + (string-append py "/lib/python" ver)) + #t)))))) (home-page "https://fedorahosted.org/newt/") (synopsis "Not Erik's Windowing Toolkit - text mode windowing with s= lang") (description --=20 2.5.0