unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Sharlatan Hellseher <sharlatanus@gmail.com>
To: 61772@debbugs.gnu.org
Cc: Sharlatan Hellseher <sharlatanus@gmail.com>
Subject: [bug#61772] [PATCH 2/5] gnu: cl-sdl2: Remove input labels.
Date: Fri, 24 Feb 2023 22:23:46 +0000	[thread overview]
Message-ID: <20230224222349.26750-2-sharlatanus@gmail.com> (raw)
In-Reply-To: <20230224222349.26750-1-sharlatanus@gmail.com>

* gnu/packages/lisp.scm (sbcl-sdl2):
  [arguments]{asd-systems}: Add sdl2/examples.
  {phases}<fix-path>: Remove trailing #f from lambda, use
  search-input-file to link SO library.
  [inputs]: Remove labels, add sbcl-cl-opengl.
---
 gnu/packages/lisp-xyz.scm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 648141b19b..4772be6cef 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -20138,21 +20138,22 @@ (define-public sbcl-sdl2
           (base32 "0sjy4k04k0hdhwpr57ns16ag3za0kz4laclbk17i91ql7qdjw9z2"))))
       (build-system asdf-build-system/sbcl)
       (arguments
-       `(#:phases
+       `(#:asd-systems '("sdl2" "sdl2/examples")
+         #:phases
          (modify-phases %standard-phases
            (add-after 'unpack 'fix-paths
              (lambda* (#:key inputs #:allow-other-keys)
                (substitute* "src/library.lisp"
-                 (("libSDL2-2.0.so.0" all)
-                  (string-append (assoc-ref inputs "libsdl2") "/lib/" all)))
-               #t)))))
+                 (("libSDL2-2.0.so.0")
+                  (search-input-file inputs "/lib/libSDL2-2.0.so.0"))))))))
       (inputs
-       `(("alexandria" ,sbcl-alexandria)
-         ("cl-autowrap" ,sbcl-cl-autowrap)
-         ("cl-ppcre" ,sbcl-cl-ppcre)
-         ("libsdl2" ,sdl2)
-         ("trivial-channels" ,sbcl-trivial-channels)
-         ("trivial-features" ,sbcl-trivial-features)))
+       (list sbcl-alexandria
+             sbcl-cl-autowrap
+             sbcl-cl-opengl
+             sbcl-cl-ppcre
+             sbcl-trivial-channels
+             sbcl-trivial-features
+             sdl2))
       (home-page "https://github.com/lispgames/cl-sdl2")
       (synopsis "Common Lisp bindings for SDL2 using C2FFI")
       (description
-- 
2.39.1





  reply	other threads:[~2023-02-24 22:25 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-24 22:22 [bug#61772] [PATCH 0/5] gnu: Add cl-calm Sharlatan Hellseher
2023-02-24 22:23 ` [bug#61772] [PATCH 1/5] gnu: cl-sdl2: Update to 0.0.0-2.80410b5 Sharlatan Hellseher
2023-02-24 22:23   ` Sharlatan Hellseher [this message]
2023-02-24 22:23   ` [bug#61772] [PATCH 3/5] gnu: Add cl-sdl2-mixer Sharlatan Hellseher
2023-02-24 22:23   ` [bug#61772] [PATCH 4/5] gnu: Add sbcl-cl-cairo2 Sharlatan Hellseher
2023-02-24 22:23   ` [bug#61772] [PATCH 5/5] gnu: Add cl-calm Sharlatan Hellseher
2023-02-27 13:17 ` bug#61772: [PATCH 0/5] " Guillaume Le Vaillant

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

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230224222349.26750-2-sharlatanus@gmail.com \
    --to=sharlatanus@gmail.com \
    --cc=61772@debbugs.gnu.org \
    /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 public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).