From: Mark H Weaver <mhw@netris.org>
To: Andy Wingo <wingo@pobox.com>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH] gnu: Add libepoxy.
Date: Mon, 06 Apr 2015 19:05:12 -0400 [thread overview]
Message-ID: <87siccyi1j.fsf@netris.org> (raw)
In-Reply-To: <87wq1q37ls.fsf@pobox.com> (Andy Wingo's message of "Sun, 05 Apr 2015 17:41:51 +0200")
Andy Wingo <wingo@pobox.com> writes:
> From 42e4d5669bd12dbe7de3e47d14f987a0f3cd7059 Mon Sep 17 00:00:00 2001
> From: Andy Wingo <wingo@pobox.com>
> Date: Sun, 5 Apr 2015 11:28:32 +0200
> Subject: [PATCH 2/3] gnu: Add libepoxy.
>
> * gnu/packages/gl.scm (libepoxy): New variable.
> ---
> gnu/packages/gl.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 46 insertions(+)
>
>
> diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
> index dc90a12..15bc91c 100644
> --- a/gnu/packages/gl.scm
> +++ b/gnu/packages/gl.scm
> @@ -418,3 +418,49 @@ extension functionality is exposed in a single header file.")
> "Guile-OpenGL is a library for Guile that provides bindings to the
> OpenGL graphics API.")
> (license l:lgpl3+)))
> +
> +(define-public libepoxy
> + (package
> + (name "libepoxy")
> + (version "1.2")
> + (source (origin
> + (method url-fetch)
> + (uri (string-append
> + "https://github.com/anholt/libepoxy/archive/v"
> + version
> + ".tar.gz"))
For source URIs like this, where the last file name component doesn't
contain the package name (in this case it is "v1.2.tar.gz"), we prefer
to add a 'file-name' field to the 'origin' form:
(file-name (string-append name "-" version ".tar.gz"))
Otherwise, the file name of the source tarball in the store will be
/gnu/store/<HASH>-v1.2.tar.gz which is suboptimal.
> + (sha256
> + (base32
> + "1xp8g6b7xlbym2rj4vkbl6xpb7ijq7glpv656mc7k9b01x22ihs2"))))
> + (arguments
> + '(#:phases
> + (alist-cons-after
> + 'unpack 'autoreconf
> + (lambda _
> + (zero? (system* "autoreconf" "-vif")))
> + (alist-cons-before
> + 'configure 'patch-paths
> + (lambda* (#:key inputs #:allow-other-keys)
> + (let ((python (assoc-ref inputs "python"))
> + (mesa (assoc-ref inputs "mesa")))
> + (substitute* "src/gen_dispatch.py"
> + (("/usr/bin/env python") python))
> + (substitute* (find-files "." "\\.[ch]$")
> + (("libGL.so.1") (string-append mesa "/lib/libGL.so.1"))
> + (("libEGL.so.1") (string-append mesa "/lib/libEGL.so.1")))))
Phases are supposed to return true for success or false for failure.
Since 'substitute*'s return value is unspecified, we should add a #t to
the end.
I went ahead and pushed this to 'core-updates' with these changes.
Thanks!
Mark
prev parent reply other threads:[~2015-04-06 23:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-05 15:41 [PATCH] gnu: Add libepoxy Andy Wingo
2015-04-05 17:12 ` David Thompson
2015-04-06 23:05 ` Mark H Weaver [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87siccyi1j.fsf@netris.org \
--to=mhw@netris.org \
--cc=guix-devel@gnu.org \
--cc=wingo@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.