From 5d83bd2e981b1b0f0fc8ce49042d769ebb4bb1dc Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Fri, 2 Oct 2020 11:12:41 +0200 Subject: [PATCH] nongnu: eduke32: Remove unnecessary phase. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since commit 2073b55, Guix uses CPLUS_INCLUDE_PATH to find system headers. Overriding this variable caused a compile failure. The package builds fine without it, so just drop it. * nongnu/packages/game-development.scm (eduke32)[arguments]: Drop ‘set-sdl-paths’ phase. Signed-off-by: Jonathan Brielmaier --- nongnu/packages/game-development.scm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/nongnu/packages/game-development.scm b/nongnu/packages/game-development.scm index 95facd2..00ebb00 100644 --- a/nongnu/packages/game-development.scm +++ b/nongnu/packages/game-development.scm @@ -214,16 +214,6 @@ development should opt for GLSL rather than Cg.") '("multivoc.cpp" "xmp.cpp"))) #t)) (delete 'configure) - (add-after 'set-paths 'set-sdl-paths - ;; The makefile adds the output of `sdl2-config --cflags` to the - ;; compiler flags, but sdl2-config gives us the wrong directory to - ;; include. We have to add the SDL2 header directory ourselves. - (lambda* (#:key inputs #:allow-other-keys) - (pk (assoc-ref inputs "sdl-union")) - (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "sdl-union") - "/include/SDL2")) - #t)) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))