guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: gnu: guile-sdl2: Install compiled files to the expected place.


From: Ricardo Wurmus
Subject: 01/02: gnu: guile-sdl2: Install compiled files to the expected place.
Date: Wed, 20 Jun 2018 05:28:22 -0400 (EDT)

rekado pushed a commit to branch master
in repository guix.

commit e5b77ccfe861545a61f6c6355f5c9fb712bc4894
Author: Ricardo Wurmus <address@hidden>
Date:   Wed Jun 20 10:56:23 2018 +0200

    gnu: guile-sdl2: Install compiled files to the expected place.
    
    * gnu/packages/sdl.scm (guile-sdl2)[arguments]: Add build phase
    "patch-makefile".
---
 gnu/packages/sdl.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 43cf279..ba4477d 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
 ;;; Copyright © 2017 Rutger Helling <address@hidden>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -503,7 +504,16 @@ sound and device input (keyboards, joysticks, mice, 
etc.).")
              (string-append "--with-libsdl2-ttf-prefix="
                             (assoc-ref %build-inputs "sdl2-ttf"))
              (string-append "--with-libsdl2-mixer-prefix="
-                            (assoc-ref %build-inputs "sdl2-mixer")))))
+                            (assoc-ref %build-inputs "sdl2-mixer")))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'configure 'patch-makefile
+           (lambda _
+             ;; Install compiled Guile files in the expected place.
+             (substitute* '("Makefile")
+               (("^godir = .*$")
+                "godir = $(moddir)\n"))
+             #t)))))
     (native-inputs
      `(("guile" ,guile-2.2)
        ("pkg-config" ,pkg-config)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]