guix-devel
[Top][All Lists]
Advanced

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

Re: [PATCH] gnu: Add hoedown.


From: Mark H Weaver
Subject: Re: [PATCH] gnu: Add hoedown.
Date: Tue, 21 Jul 2015 14:53:51 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)

David Thompson <address@hidden> writes:

> From 567748faa4e3e03fe9b106a8ea61843a2d31409d Mon Sep 17 00:00:00 2001
> From: David Thompson <address@hidden>
> Date: Sun, 19 Jul 2015 10:41:34 -0400
> Subject: [PATCH] gnu: Add hoedown.

Sorry for not reviewing this earlier, but...

> +     '(#:phases (modify-phases %standard-phases
> +                  (add-before 'build 'fix-makefile
> +                              (lambda* (#:key outputs #:allow-other-keys)
> +                                (setenv "CC" "gcc")
> +                                (substitute* '("Makefile")
> +                                  (("/usr/local")
> +                                   (assoc-ref outputs "out")))
> +                                #t))

Instead of the 'fix-makefile' phase, you can simply do this:

  #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output))

I tested the following patch, and it works.

      Mark


diff --git a/gnu/packages/markdown.scm b/gnu/packages/markdown.scm
index 58ca102..ee0edfc 100644
--- a/gnu/packages/markdown.scm
+++ b/gnu/packages/markdown.scm
@@ -38,14 +38,8 @@
                "0mmmkfayqgh6k39kbi3pq68mg03x35aiygy3zypxzvwx9y8b53ky"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:phases (modify-phases %standard-phases
-                  (add-before 'build 'fix-makefile
-                              (lambda* (#:key outputs #:allow-other-keys)
-                                (setenv "CC" "gcc")
-                                (substitute* '("Makefile")
-                                  (("/usr/local")
-                                   (assoc-ref outputs "out")))
-                                #t))
+     '(#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output))
+       #:phases (modify-phases %standard-phases
                   (delete 'configure)) ; no configure script
        #:test-target "test"))
     (native-inputs



reply via email to

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