From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6Id4EgtxCmGcAwEAgWs5BA (envelope-from ) for ; Wed, 04 Aug 2021 12:50:51 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 8IcQDgtxCmEbbQAAB5/wlQ (envelope-from ) for ; Wed, 04 Aug 2021 10:50:51 +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 C47FEACE7 for ; Wed, 4 Aug 2021 12:50:50 +0200 (CEST) Received: from localhost ([::1]:41132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mBEU5-0004CS-RN for larch@yhetil.org; Wed, 04 Aug 2021 06:50:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBETL-0004Bz-Ay for guix-patches@gnu.org; Wed, 04 Aug 2021 06:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59570) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mBETL-0003ZV-2u for guix-patches@gnu.org; Wed, 04 Aug 2021 06:50:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mBETK-0004il-V6 for guix-patches@gnu.org; Wed, 04 Aug 2021 06:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49871] [PATCH 2/3] gnu: endless-sky: Clean up phases. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Aug 2021 10:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49871 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49871@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 49871-submit@debbugs.gnu.org id=B49871.162807418918111 (code B ref 49871); Wed, 04 Aug 2021 10:50:02 +0000 Received: (at 49871) by debbugs.gnu.org; 4 Aug 2021 10:49:49 +0000 Received: from localhost ([127.0.0.1]:42880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBET6-0004hw-UB for submit@debbugs.gnu.org; Wed, 04 Aug 2021 06:49:49 -0400 Received: from araneo.si ([90.157.193.204]:54918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBET5-0004hZ-8e for 49871@debbugs.gnu.org; Wed, 04 Aug 2021 06:49:47 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id ab6fcdde for <49871@debbugs.gnu.org>; Wed, 4 Aug 2021 10:49:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=yxBaCk2ui4lkRgkhst8k3 q+kIpo=; b=Nn6J1w9BlklBig7jZFWGizwNjQotWm3X5T5mE7NyhibptTsHy5MQ1 O+h4NxzATZtqmnBFQpriPvzuPqLB7/VOzvKfkHjldwo7vqHNC7uNfvW40zURYdTq uCkFm6UOr/u9BgF6wAE9Ux69Ojrq8uEYkRcQfRftJpULw+G1cBV09yUQl8jflnRN G7L9F1bmNJQvf3NYekTVtXsm1MhEluuPGQhIuXfeDMAeZJxmGKQznI1WORYDl7gD IXxwh2HK93URYmaQzmAWJZb3/XkVBMtOfTYZo/jqQTse+tdyjJlrfHO+oNKaVqSB FjuzaxDylZR0ng8I6x3uVBYY0WOSNz24g== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 8f52efba (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 4 Aug 2021 10:49:45 +0000 (UTC) From: Timotej Lazar Date: Wed, 4 Aug 2021 12:49:31 +0200 Message-Id: <20210804104932.2469-2-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210804104932.2469-1-timotej.lazar@araneo.si> References: <87k0l1lc94.fsf@araneo.si> <20210804104932.2469-1-timotej.lazar@araneo.si> 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=1628074250; 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:dkim-signature; bh=r5DIQZWMQNj8OSN1GbmdDQhhENlbgBPMOt9a9o0N05M=; b=FA5npg0FRgqfddA3zJoKQ21sqyUTyn0aJX+uGpnOu38uKzIU0FcU3Vo0WfZkpHV3haPxVM ijmqRtFs2EkGDCftP8SKHQOdxU5i4RH5OM8xoE1StQWFUC9y/Cu5EpWh5T2jVKDnMHZkzy Z7PMQXQpf0z9u6UTjMPPSPzsj6/OVRkViOQooF2EK9DM8r4JnX6XC68cmlxBudf80wAevF FYMlGRhSODmQotOryQBf4qW60+jNqwtQJD9GO/El1llEHHI38zdaAHHzjquFIVW+GrhSr1 OwwPrpsti83LNg8tl0IsNYAJffU1Fw0hbBjYJJAn1OUA4Y88JNLT8vjMWqe1XA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628074250; a=rsa-sha256; cv=none; b=UHlvMeSljDjxj8AFBbqsIVIyX+v1d9te0n81wUMBG1F/NH4p7oFQcS0TOvxvwElULn5Q7k EUfbaGqQ+SfpiIsV5cUQbMMy2yrFmoBFfa11qRr+nFeXUwDXOW2msqn96N84mdsB/ymdc5 kNCccxfaqSnWRVtmQv5LsxImLRMOj4jIOvHzPPl9zqXQhv8uqPh2vd0S16pwjru+nzqkl4 /bevv9vcFu2FoDN17MoCgmUjOnEa3eQoDj4h3XrgYqlRtkKQLBTGQYcAber9VAi9WvyRJF 9sgknqNJtl8KJuKMLf9McPrH8w+ufpeuI0L6iNp7IAokMMrl3UPn+JuZwxC0fg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20180623 header.b=Nn6J1w9B; dmarc=fail reason="SPF not aligned (relaxed)" header.from=araneo.si (policy=none); 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: 3.69 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20180623 header.b=Nn6J1w9B; dmarc=fail reason="SPF not aligned (relaxed)" header.from=araneo.si (policy=none); 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: C47FEACE7 X-Spam-Score: 3.69 X-Migadu-Scanner: scn1.migadu.com X-TUID: INo1Lj5vm6+S * gnu/packages/games.scm (endless-sky)[arguments]: Drop unused substitution and merge existing phases into 'fix-paths. --- gnu/packages/games.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 792ff64a07..9a595162de 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -8368,19 +8368,13 @@ your score gets higher, you level up and the blocks fall faster.") #:tests? #f ; no tests #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-resource-locations + (add-after 'unpack 'fix-paths (lambda* (#:key outputs #:allow-other-keys) + ;; Look for resources in the store directory. (substitute* "source/Files.cpp" - (("/usr/local/") - (string-append (assoc-ref outputs "out") "/"))) - #t)) - (add-after 'unpack 'patch-scons - (lambda _ + (("/usr/local") (assoc-ref outputs "out"))) + ;; Install game binary into %out/bin. (substitute* "SConstruct" - ;; Keep environmental variables - (("Environment\\(\\)") - "Environment(ENV = os.environ)") - ;; Install into %out/bin (("games\"") "bin\"")) #t)) (add-before 'build 'use-gcc-ar -- 2.32.0