diff mbox series

[bug#42454] gnu: enigma: Fix enigma.

Message ID 809b8336-0f80-423a-f754-4d2c5eefa8ae@gmail.com
State Accepted
Headers show
Series [bug#42454] gnu: enigma: Fix enigma. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job

Commit Message

Jesse Gibbons July 28, 2020, 4:04 a.m. UTC 
Attached. I removed some debug code I had left in.

On 7/24/20 7:21 PM, Brett Gilio wrote:
> Jesse Gibbons <jgibbons2357@gmail.com> writes:
>
>> * gnu/packages/games.scm: enigma(phases): Add 'fix-proxy.
>> ---
>> gnu/packages/games.scm | 12 +++++++++++-
>> 1 file changed, 11 insertions(+), 1 deletion(-)
>>
>> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
>> index 2efbb3964e..14d47dcbe6 100644
>> --- a/gnu/packages/games.scm
>> +++ b/gnu/packages/games.scm
>> @@ -5872,7 +5872,17 @@ The Flag. You can even design your own maps!")
>> (substitute* "src/main.cc"
>> (("#include <SDL_(image|ttf|mixer).h>" line header)
>> (string-append "#include \"SDL/SDL_" header ".h\"")))
>> - #t)))))
>> + #t))
>> + (add-after 'find-sdl 'fix-proxy
>> + (lambda _
>> + ;; Build fails when making src/lev/Proxy.cc because
>> + ;; the wrong operator overload is used.
>> + (substitute* "src/lev/Proxy.cc"
>> + (("ifs != NULL")
>> + "!ifs"))
>> + (display "...")
>> + #t))
>> + )))
>> (inputs
>> `(("xerces-c" ,xerces-c)
>> ("sdl-union" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf)))
> Hey Jesse,
>
> Just like the last patch this one is mangled :).
diff mbox series

Patch

From a2ed7bff6ff65518910edac44f7e498418042bfb Mon Sep 17 00:00:00 2001
From: Jesse Gibbons <jgibbons2357+guix@gmail.com>
Date: Fri, 3 Jul 2020 18:35:57 -0600
Subject: [PATCH v2 1/1] gnu: enigma: Fix enigma.

* gnu/packages/games.scm: enigma(phases): Add 'fix-proxy.
---
 gnu/packages/games.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2efbb3964e..057f7f2d45 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5872,7 +5872,16 @@  The Flag.  You can even design your own maps!")
              (substitute* "src/main.cc"
                (("#include <SDL_(image|ttf|mixer).h>" line header)
                 (string-append "#include \"SDL/SDL_" header ".h\"")))
-             #t)))))
+             #t))
+	 (add-after 'find-sdl 'fix-proxy
+           (lambda _
+             ;; Build fails when making src/lev/Proxy.cc because
+             ;; the wrong operator overload is used.
+             (substitute* "src/lev/Proxy.cc"
+               (("ifs != NULL")
+                "!ifs"))
+             #t))
+	 )))
     (inputs
      `(("xerces-c" ,xerces-c)
        ("sdl-union" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf)))
-- 
2.27.0