From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: [PATCH 1/2] gnu: Add stfl. Date: Thu, 10 Nov 2016 19:22:47 +0200 Message-ID: <20161110172247.GI2348@macbook42.flashner.co.il> References: <20161110082736.5825-1-efraim@flashner.co.il> <20161110082736.5825-2-efraim@flashner.co.il> <87y40r9x69.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="JsihDCElWRmQcbOr" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4t3t-0003yA-TL for guix-devel@gnu.org; Thu, 10 Nov 2016 12:22:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c4t3q-0004hp-Q5 for guix-devel@gnu.org; Thu, 10 Nov 2016 12:22:53 -0500 Received: from flashner.co.il ([178.62.234.194]:47471) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4t3q-0004gN-EA for guix-devel@gnu.org; Thu, 10 Nov 2016 12:22:50 -0500 Content-Disposition: inline In-Reply-To: <87y40r9x69.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> 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" To: Marius Bakke Cc: guix-devel@gnu.org --JsihDCElWRmQcbOr Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Nov 10, 2016 at 03:22:54PM +0000, Marius Bakke wrote: > Efraim Flashner writes: >=20 > > * gnu/packages/ncurses.scm (stfl): New variable. > > --- > > gnu/packages/ncurses.scm | 50 ++++++++++++++++++++++++++++++++++++++++= +++++++- > > 1 file changed, 49 insertions(+), 1 deletion(-) > > > > + ;; there is no configure script so we get to do it manually > > + (replace 'configure > > + (lambda* (#:key outputs #:allow-other-keys) > > + (substitute* "Makefile" > > + (("\\$\\(prefix\\)") (assoc-ref outputs "out"))) > > + (setenv "DESTDIR" "") > > + #t)) >=20 > Would it work to simply (setenv "prefix" out), instead of substituting? > Not sure which approach I prefer however, so feel free to disregard this. >=20 It turns out it does work. Its also much shorter. Even better, I figured out how to turn them into make-flags #:make-flags (list (string-append "prefix=3D" (assoc-ref %outputs "out")) "DESTDIR=3D\"\"") > > + ;; in our ncurses, the headers are in /include > > + (add-before 'build 'patch-ncursesw > > + (lambda _ > > + (substitute* '("stfl_internals.h") > > + (("ncursesw/") "")) > > + #t)) > > + (add-after 'install 'install-missing-symlink > > + (lambda* (#:key outputs #:allow-other-keys) > > + (let* ((out (assoc-ref outputs "out")) > > + (lib (string-append out "/lib"))) > > + ;; newsbeuter looks for libstfl.so.0 >=20 > Perhaps just say "some programs" instead of newsbeuter, since they are > mostly unrelated. >=20 > > + (symlink "libstfl.so" > > + (string-append lib "/libstfl.so.0")))))))) > > + (inputs > > + `(("ncurses" ,ncurses) > > + ("swig" ,swig))) >=20 > Swig should probably be a native-input. Other than that LGTM! >=20 I thought the output referred to swig, but it seems not. > > + (home-page "http://www.clifford.at/stfl/") > > + (synopsis "Structured terminal forms library") > > + (description "Stfl is a library which implements a curses-based wi= dget > > +set for text terminals.") > > + (license lgpl3+))) > > --=20 > > 2.10.2 --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --JsihDCElWRmQcbOr Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJYJKy3AAoJEPTB05F+rO6TWk0P/36f90fP9NUjkJ3yg00NjeS4 YDe9Dx+q9YkfDgM11Kr75pAlI8PN5SzKdejOFZp+hAQaCd7z5c6vhNIV4PnGzQfL MMxtp1ewsKiOrA9kebiVtF2f5bRS6eqAbcdxFENEfEomB610TVZ1xsrZyAYsBMeV QEYzXjJOB0Fmnm+rJUS/owz3kc34f4PdOtph4dFa0Id9nIWRV0+exsK04OIowoXe StLzAbCYUztgaXEQeZkQelzP1tEDMUfhUFwd8t/4Ded+CMR0jxIVTo5w0oAy8i7l ycqSP7v/OegW6dPIjknUK1o6rt9P4KAo0QamIQJZEN9UFHv/ZsCvkMPPYzx3S7Mi yP5BGbaCw6BW0OhV86Crn+LYfj586OFzOccYRZSKJ1qhNgyTln4i5kWWIdLQCcip xZhytfS558FV9KjM7l41c8/1jWKtOYV+qEKUu31jOwLAMq/5FgzC5QLr9jlBIdKr pkdAEfBx69fAMzD4XGqXirCnRak5zSPhv6QshpIokFQlliVfqWHoePgt4eCd4e9B HqV8b2KmqEHFF71HwFuAJfLb44Nel0i/X5U1PAGr9XezxUnxvbn7PL/966LH4J70 8IABYBxVPKAcOHZm5c20l622A4yDgHm7tJYCSy6H2yOPuhcx6GhHv0KbXsFYOXpj 2xtwLnfF1YmmQz63uUO5 =aooH -----END PGP SIGNATURE----- --JsihDCElWRmQcbOr--