From patchwork Fri Feb 24 22:23:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 47284 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4D8C716745; Fri, 24 Feb 2023 22:25:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A3A4A162AB for ; Fri, 24 Feb 2023 22:25:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVgV1-0005DZ-7z; Fri, 24 Feb 2023 17:25:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVgUw-0005DN-E5 for guix-patches@gnu.org; Fri, 24 Feb 2023 17:25:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVgUw-0004eA-2K for guix-patches@gnu.org; Fri, 24 Feb 2023 17:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVgUv-0003yq-Sd for guix-patches@gnu.org; Fri, 24 Feb 2023 17:25:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61772] [PATCH 2/5] gnu: cl-sdl2: Remove input labels. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Feb 2023 22:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61772 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61772@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 61772-submit@debbugs.gnu.org id=B61772.167727744415210 (code B ref 61772); Fri, 24 Feb 2023 22:25:01 +0000 Received: (at 61772) by debbugs.gnu.org; 24 Feb 2023 22:24:04 +0000 Received: from localhost ([127.0.0.1]:38431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVgU0-0003xF-EU for submit@debbugs.gnu.org; Fri, 24 Feb 2023 17:24:04 -0500 Received: from mail-wm1-f49.google.com ([209.85.128.49]:36784) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVgTu-0003w5-HC for 61772@debbugs.gnu.org; Fri, 24 Feb 2023 17:23:58 -0500 Received: by mail-wm1-f49.google.com with SMTP id l2-20020a05600c1d0200b003e1f6dff952so3267580wms.1 for <61772@debbugs.gnu.org>; Fri, 24 Feb 2023 14:23:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=l/XldzB3fyaQkhb91Df+re2ph7qqmRZR3TYVovwjvSk=; b=WDL2EJNs0YarsEXmZaNLr3r3Ue3XPQcxZKhPHmfa0USR9wcsgfIpziOkHKRIiyLV3m YwyTfoQ84kR0ooEM5qO+S3+BLfPmaQq2Bgks74DnX6jKdgq10dY4Yfk8UZozSRbh6yZ3 H7wdpn1iqJkPkwU/ZNuaWQm7MvOdRQbj0NNuXQUXHOygzRl4eevLi98DIsAKcdQcIsNU nXeFuclBtb3uWg0ER7IgqwaSpg08ldIvKUtLkO82foT4Y7dBBP7/q5ijiYrKEMZJB4Ks fQ5ZocTBoCozP3MDwYAhdEwDPGMlMt36U9lPCMRJfrpXETs3ukXDVnBF9BQFCAW+WP8A zG/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l/XldzB3fyaQkhb91Df+re2ph7qqmRZR3TYVovwjvSk=; b=EAk5fOmCruvMMNA+zN/NIvnm5Rc1b1xu/nMC0P6OkpIwXOMTvUaf/Itpj14ssQuDM9 OZv9Bfqcp3N/MghD3Pb2lYYvi5/zn0gGH/YNRUevCOf8AmeGFcJrk9/dTL6RP6ZqFHME +uyVGUWhVG2j1vxlgX2BpqtA0XidggzT8kpDiWGbu191KsEyXykjB8hpuejqse4x1At5 /Y3ITeHf5E2m8Q66r7VUbTtfrY6sT/93bej1qntrptYcqouei1J2U8unj29qLgH7hg6g XRxVZ6tMYmwxZOiQipBSV1huPpC/Zxr8DCow0q1+2K2g+7XawF4gxhKBGddiI3fyVwb0 ikQQ== X-Gm-Message-State: AO0yUKVQu2vBR8Pac0dDAlrWEJtt9c94qWMGnnKRHkypnKIuFetsWB8W wgIlLQDZQ2Bfl6xk4EzU9eFz2kE0ZG4= X-Google-Smtp-Source: AK7set+S+ICgnoGhV0Hsyh8B3Es+2DFPGEBhfyB827+TyJxtHUSzqtUXVDswV2WKrSWoPYYrCIf+hg== X-Received: by 2002:a05:600c:998:b0:3eb:86a:6bb0 with SMTP id w24-20020a05600c099800b003eb086a6bb0mr3605908wmp.35.1677277432859; Fri, 24 Feb 2023 14:23:52 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id fj10-20020a05600c0c8a00b003e7c89b3514sm4369422wmb.23.2023.02.24.14.23.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 14:23:52 -0800 (PST) From: Sharlatan Hellseher Date: Fri, 24 Feb 2023 22:23:46 +0000 Message-Id: <20230224222349.26750-2-sharlatanus@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230224222349.26750-1-sharlatanus@gmail.com> References: <20230224222349.26750-1-sharlatanus@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/lisp.scm (sbcl-sdl2): [arguments]{asd-systems}: Add sdl2/examples. {phases}: 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