From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id iGcZOCyLIWBDRAAA0tVLHw (envelope-from ) for ; Mon, 08 Feb 2021 19:04:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id IFnVMyyLIWCIYwAAbx9fmQ (envelope-from ) for ; Mon, 08 Feb 2021 19:04:12 +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 3267E940251 for ; Mon, 8 Feb 2021 19:04:11 +0000 (UTC) Received: from localhost ([::1]:35386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9BpR-0004NB-Uz for larch@yhetil.org; Mon, 08 Feb 2021 14:04:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95xT-0004i8-RF for guix-patches@gnu.org; Mon, 08 Feb 2021 07:48:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:38560) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95xR-0001UW-M7 for guix-patches@gnu.org; Mon, 08 Feb 2021 07:48:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l95xR-0006Jn-Kc for guix-patches@gnu.org; Mon, 08 Feb 2021 07:48:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46378] [PATCH] gnu: Add instead. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Feb 2021 12:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46378 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Dmitry Polyakov Cc: 46378@debbugs.gnu.org Received: via spool by 46378-submit@debbugs.gnu.org id=B46378.161278842624223 (code B ref 46378); Mon, 08 Feb 2021 12:48:01 +0000 Received: (at 46378) by debbugs.gnu.org; 8 Feb 2021 12:47:06 +0000 Received: from localhost ([127.0.0.1]:50106 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l95wR-0006IG-VH for submit@debbugs.gnu.org; Mon, 08 Feb 2021 07:47:06 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:13380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l95wP-0006I6-AO for 46378@debbugs.gnu.org; Mon, 08 Feb 2021 07:46:58 -0500 Received: from nijino.local (217-149-173-242.nat.highway.telekom.at [217.149.173.242]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DZ5Pp3PBHz3wNk; Mon, 8 Feb 2021 13:46:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1612788414; bh=5dGDkoecCvxWOOhPHGnXDnlf669Dg9QCcfrVEwpf8t8=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=YlzqQii7JduAXukLafmkFEAZ326nRaLTwXHCo5mQ6MrILOIZex7WFJyOAPXkM6V8r 1GBAtt13LMwjbVd5B8V5BIzxeSshSMUwlAAvdgMRRlxg7GThlsE1nI22ycFzD8giVK vkasDYOTs9jA3GSv9QZpgAPh9efUzugE3rVyZUHg= Message-ID: <33da1d54a4c1060302bc06013fd784155dd55f57.camel@student.tugraz.at> From: Leo Prikler Date: Mon, 08 Feb 2021 13:46:53 +0100 In-Reply-To: <87o8gv58h0.fsf@liltechdude.xyz> References: <87o8gv58h0.fsf@liltechdude.xyz> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Spam-Score: 2.1 X-TUGAntiSpamFlag: ham 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 X-Migadu-Spam-Score: -1.26 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=YlzqQii7; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (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: 3267E940251 X-Spam-Score: -1.26 X-Migadu-Scanner: scn0.migadu.com X-TUID: x34QGwKr9WCx Hello, Am Montag, den 08.02.2021, 02:23 -0500 schrieb Dmitry Polyakov: > hope this work Sadly it doesn't seem so, I can't seem to get the patch to apply. If you don't have git send-email set up, you might want to simply send the patch as an attachment instead. > From b0693f72129958c7d9e18cd5efb5d83902dee8f3 Mon Sep 17 00:00:00 > 2001 > From: Dmitry Polyakov > Subject: [PATCH] gnu: Add instead. > > * gnu/local.mk (instead): New variable. That's not the list of changes that have been made. > --- a/gnu/packages/game-development.scm > +++ b/gnu/packages/game-development.scm > @@ -20,6 +20,7 @@ > ;;; Copyright © 2020 Nicolas Goaziou > ;;; Copyright © 2020 Timotej Lazar > ;;; Copyright © 2020 Giacomo Leidi > +;;; Copyright © 2021 Dmitry Polyakov > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -1961,6 +1962,50 @@ all modern computing platforms. Each library > component is fairly independent > of the others") > (license license:lgpl2.0+))) > > +(define-public instead > + (package > + (name "instead") > + (version "3.3.2") > + (build-system cmake-build-system) > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/instead-hub/instead") > + (commit version))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > "014wfz5z5x72rhnakczpgfyw8s6bq510bxfmn4gv66jahkh4b65f")) > + (patches > + (search-patches > + "instead-use-games-path.patch")))) > + (arguments > + '(#:configure-flags > + (list (string-append > + "-DLUA_INCLUDE_DIR=" > + (assoc-ref %build-inputs "luajit") > "/include/luajit-2.1/") > + "-DWITH_LUAJIT=1" > + "-DWITH_GTK3=1") > + #:tests? #f)) > + (native-inputs > + `(("pkg-config" ,pkg-config))) > + (inputs > + `(("sdl2-images" ,sdl2-image) > + ("sdl2-ttf" ,sdl2-ttf) > + ("lua" ,lua) > + ("sdl2-mixer" ,sdl2-mixer) > + ("luajit" ,luajit) > + ("gtk+",gtk+))) > + (home-page "https://instead3.syscall.ru/") > + (synopsis "Simple text adventure interpreter for Unix and > Windows") Shorten to "Text adventure interpreter". > + (description "Simple text adventure interpreter for Unix and > Windows.") The description should be at least one full sentence. Also try not to mention proprietary software ;) > +From eba79afc957b9dc89cfd5c21434bd8ad5e0363bb Mon Sep 17 00:00:00 > 2001 > +From: Dmitry Polyakov > +Date: Wed, 3 Feb 2021 14:33:37 -0500 > +Subject: [PATCH] add custom gamedir support Try to use a more descriptive commit message in this patch as well. Regards, Leo