From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mEuIFvOr8WAdRAEAgWs5BA (envelope-from ) for ; Fri, 16 Jul 2021 17:55:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id KOVEEvOr8WDSGQAAB5/wlQ (envelope-from ) for ; Fri, 16 Jul 2021 15:55:31 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8A5955B8A for ; Fri, 16 Jul 2021 17:55:30 +0200 (CEST) Received: from localhost ([::1]:36978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4QBV-0003TG-Lg for larch@yhetil.org; Fri, 16 Jul 2021 11:55:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4QB6-0002up-60 for guix-patches@gnu.org; Fri, 16 Jul 2021 11:55:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40605) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4QB5-0005mA-V6 for guix-patches@gnu.org; Fri, 16 Jul 2021 11:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m4QB5-00032a-V8 for guix-patches@gnu.org; Fri, 16 Jul 2021 11:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49597] [PATCH core-updates 05/15] gnu: Use 'search-input-directory' for the SDL header directory. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Jul 2021 15:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49597 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49597@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 49597-submit@debbugs.gnu.org id=B49597.162645090111647 (code B ref 49597); Fri, 16 Jul 2021 15:55:03 +0000 Received: (at 49597) by debbugs.gnu.org; 16 Jul 2021 15:55:01 +0000 Received: from localhost ([127.0.0.1]:52145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4QB2-00031i-ER for submit@debbugs.gnu.org; Fri, 16 Jul 2021 11:55:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43140) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4QAw-00031D-6Q for 49597@debbugs.gnu.org; Fri, 16 Jul 2021 11:54:56 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33718) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4QAq-0005bZ-UI; Fri, 16 Jul 2021 11:54:48 -0400 Received: from vpn-0-27.aquilenet.fr ([2a0c:e300:4:27::]:38216 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4QAq-0004IN-Dv; Fri, 16 Jul 2021 11:54:48 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 16 Jul 2021 17:54:10 +0200 Message-Id: <20210716155420.32447-5-ludo@gnu.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210716155420.32447-1-ludo@gnu.org> References: <20210716155420.32447-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626450931; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=lQoC/zk9Kahhjgy8b2w5rUPiEB+esheNKhNeSg3oFKU=; b=kMqBtKXtaHeMFgUJd6CQ+PepQm2atXyCfOWmZ6iE9m8YfBsjWeCmOtU1m9+riLbiatE3u+ unTylENPIgZDLSIckIpTKRgGKTcXPLpiv+Jb0essptNtEjNhzf77DrF/tb1zdL1Aansycc xhL2CkM5TtFOKZ4YwROGH5LcawZIOmZyNI7IpmgAdSRM/b1kqBCsautcDgdVF3xjLiz/v4 3360gW+Rxy1DD3hwR/ML2t5b/WH4JdFsqTqnuKPx23KDQQshDreFLXhEkL39qIvDUXp9+Z Qb+FN3ZDY5g7gqMt3saGz1GaENSQy20u8zNWaCKO3o3UkW0iRFXbAUxX41r7mA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626450931; a=rsa-sha256; cv=none; b=FW5CbI/dUcgj402fD0wCmYa4tR2/aPSEtW/vnPgRNFZCvWjO3W0hptUuF78IK9sdpodsHG QNajnGSLYibeLdIIDXIi79WO37qsRm30B6VPsrycIPpHsKC+SFJaCNLJm3423ZGbGMr+cq li/cieframfcBeiI2Dj1Re/eJgRRP7Mooe7GVNTc2Qsc7JGkR1SPXTYb/JZGaAEMJlCKZg hDLL+CYWZ7Rc8uoF34Tf5NCBDqhruA521isGBMM0PncZHwzmCjWssIifY0m8wLgTUnWg7U EWsAd983V13k8zDC0Xb78wzO0k+yfqBGnMCUTLAkss3gmebOj6D1GafDlNz+aQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.09 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 8A5955B8A X-Spam-Score: 2.09 X-Migadu-Scanner: scn1.migadu.com X-TUID: ZwwwiiAACDrK * gnu/packages/education.scm (gcompris)[arguments]: Use 'search-input-directory' when searching for SDL headers. * gnu/packages/education.scm (t4k-common): Likewise. (tuxmath): Likewise. * gnu/packages/game-development.scm (tesseract-engine): Likewise. * gnu/packages/games.scm (foobillard++): Likewise. (ltris): Likewise. (prboom-plus): Likewise. (abbaye): Likewise. (red-eclipse): Likewise. (kiki): Likewise. (tome4): Likewise. (btanks): Likewise. (4dtris): Likewise. (edgar): Likewise. * gnu/packages/python-xyz.scm (python-kivy): Likewise. --- gnu/packages/education.scm | 22 +++++----- gnu/packages/game-development.scm | 7 ++- gnu/packages/games.scm | 71 ++++++++++++++----------------- gnu/packages/python-xyz.scm | 4 +- 4 files changed, 46 insertions(+), 58 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 14ebe4fffd..aed7f1f2ab 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -101,10 +101,9 @@ (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "sdl-mixer") - "/include/SDL:" - (or (getenv "CPATH") ""))) - #t))))) + (string-append + (search-input-directory inputs "include/SDL") + ":" (or (getenv "CPATH") "")))))))) (inputs `(("gtk+" ,gtk+-2) ("librsvg" ,librsvg) @@ -894,9 +893,10 @@ endless. For example: (modify-phases %standard-phases (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) - (setenv "CPATH" (string-append (assoc-ref inputs "sdl") - "/include/SDL:" - (or (getenv "CPATH") ""))))) + (setenv "CPATH" + (string-append + (search-input-directory inputs "/include/SDL") + ":" (or (getenv "CPATH") ""))))) (add-after 'unpack 'fix-andika-font-path (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/t4k_sdl.c" @@ -945,10 +945,10 @@ TuxMath and TuxType.") (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "sdl") - "/include/SDL:" - (or (getenv "CPATH") ""))) - #t)) + (string-append + (search-input-directory inputs "/include/SDL") + ":" + (or (getenv "CPATH") ""))))) (add-after 'install 'install-desktop-file (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 600940049b..92ab3e4fb5 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2560,10 +2560,9 @@ support.") (add-before 'build 'fix-env (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "sdl2-union") - "/include/SDL2:" - (or (getenv "CPATH") ""))) - #t)) + (string-append + (search-input-directory inputs "include/SDL2") + ":" (or (getenv "CPATH") ""))))) (add-after 'install 'really-install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 483cb87dcb..84b14696af 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1149,10 +1149,9 @@ characters and lines resulting in a rainbow effect.") ;; Set correct environment for SDL. (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "sdl") - "/include/SDL:" - (or (getenv "CPATH") ""))) - #t)) + (string-append + (search-input-directory inputs "include/SDL") + ":" (or (getenv "CPATH") ""))))) (add-before 'build 'fix-settings-directory ;; Hide foobillardplus settings directory in $HOME. (lambda _ @@ -1852,10 +1851,9 @@ Chess). It is similar to standard chess but this variant is far more complicate (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "sdl-union") - "/include/SDL:" - (or (getenv "CPATH") ""))) - #t))))) + (string-append + (search-input-directory inputs "include/SDL") + ":" (or (getenv "CPATH") "")))))))) (inputs `(("sdl-union" ,(sdl-union (list sdl sdl-mixer))))) (home-page "http://lgames.sourceforge.net/LTris/") @@ -2066,10 +2064,9 @@ Every puzzle has a complete solution, although there may be more than one.") (add-after 'set-paths 'set-sdl'paths (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "sdl-union") - "/include/SDL:" - (or (getenv "CPATH") ""))) - #t))))) + (string-append + (search-input-file inputs "/include/SDL") + ":" (or (getenv "CPATH") "")))))))) (inputs `(("fluidsynth" ,fluidsynth) ("glu" ,glu) @@ -2909,9 +2906,9 @@ properly.") (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "sdl-union") - "/include/SDL:" - (or (getenv "CPATH") ""))))) + (string-append + (search-input-file inputs "include/SDL") + ":" (or (getenv "CPATH") ""))))) (add-after 'patch-source-shebangs 'patch-makefile (lambda* (#:key outputs #:allow-other-keys) ;; Replace /usr with package output directory. @@ -4857,10 +4854,9 @@ http://lavachat.symlynx.com/unix/") (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "sdl-union") - "/include/SDL2:" - (or (getenv "CPATH") ""))) - #t)) + (string-append + (search-input-file inputs "/include/SDL2") + ":" (or (getenv "CPATH") ""))))) (add-after 'install 'copy-data (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -6207,11 +6203,10 @@ over 100 user-created campaigns.") (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "sdl-union") - "/include/SDL:" - (assoc-ref inputs "python") - "/include/python2.7:" - (or (getenv "CPLUS_INCLUDE_PATH") ""))) + (string-append + (search-input-directory inputs "include/SDL") ":" + (search-input-directory inputs "include/python2.7") + ":" (or (getenv "CPLUS_INCLUDE_PATH") ""))) (substitute* "src/main/main.cpp" (("#include " line) (string-append line " @@ -6942,10 +6937,9 @@ Crowther & Woods, its original authors, in 1995. It has been known as (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "sdl-union") - "/include/SDL2:" - (or (getenv "CPATH") ""))) - #t)) + (string-append + (search-input-directory inputs "/include/SDL2") + ":" (or (getenv "CPATH") ""))))) (delete 'check) ;; premake doesn't provide install target (replace 'install @@ -8580,10 +8574,9 @@ download and unpack them separately.") (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "sdl") - "/include/SDL:" - (or (getenv "CPATH") ""))) - #t)) + (string-append + (search-input-file inputs "/include/SDL") + ":" (or (getenv "CPATH") ""))))) (add-after 'unpack 'fix-compilation-errors (lambda _ (substitute* "mrt/base_file.h" @@ -8730,10 +8723,9 @@ affected by the gravity of the planets.") (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "sdl") - "/include/SDL:" - (or (getenv "CPATH") ""))) - #t))))) + (string-append + (search-input-file inputs "/include/SDL") + ":" (or (getenv "CPATH") "")))))))) (inputs `(("fontconfig" ,fontconfig) ("freeglut" ,freeglut) @@ -8849,10 +8841,9 @@ where the player draws runes in real time to effect the desired spell.") (add-before 'build 'fix-env (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "sdl2-union") - "/include/SDL2:" - (or (getenv "CPATH") ""))) - #t))))) + (string-append + (search-input-file inputs "/include/SDL2") + ":" (or (getenv "CPATH") "")))))))) (inputs `(("sdl2-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))) ("zlib" ,zlib))) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9681dd81fd..512b5be234 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15498,9 +15498,7 @@ and/or Xon/Xoff. The port is accessed in RAW mode.") (add-after 'patch-generated-file-shebangs 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) (setenv "KIVY_SDL2_PATH" - (string-append (assoc-ref inputs "sdl-union") - "/include/SDL2")) - #t))))) + (search-input-directory inputs "/include/SDL2"))))))) (native-inputs `(("pkg-config" ,pkg-config) ("python-cython" ,python-cython))) -- 2.32.0