1 files changed, 34 insertions, 35 deletions

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 998b723a812..8270c802b74 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -724,7 +724,7 @@ parser definition into a C output.")
 
 (define-public llhttp-bootstrap
   (package
-    (name "llhttp")
+    (name "llhttp-bootstrap")
     (version "9.4.2")
     (source (origin
               (method git-fetch)
@@ -748,41 +748,40 @@ parser definition into a C output.")
                   #t))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f                      ; no tests
-       #:make-flags (list (string-append "CLANG=" ,(cc-for-target))
-                          (string-append "DESTDIR=" (assoc-ref %outputs "out"))
-                          "PREFIX=")
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'configure
-           (lambda* (#:key inputs native-inputs #:allow-other-keys)
-             (let ((esbuild (search-input-file (or native-inputs inputs)
-                                               "/bin/esbuild")))
-               (invoke esbuild
-                       "--platform=node"
-                       "--target=node10"
-                       "--outfile=bin/generate.js"
-                       "--bundle" "bin/generate.ts"))))
-         (add-before 'install 'create-install-directories
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (for-each (lambda (dir)
-                           (mkdir-p (string-append out dir)))
-                         (list "/lib" "/include" "/src"))
-               #t)))
-         (add-after 'install 'install-src
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (src-dir (string-append out "/src")))
-               (install-file "build/c/llhttp.c" src-dir)
-               (install-file "src/native/api.c" src-dir)
-               (install-file "src/native/http.c" src-dir)
-               #t))))))
+     (list
+      #:tests? #f                       ; no tests
+      #:make-flags
+      #~(list (string-append "CLANG=" #$(cc-for-target))
+              (string-append "DESTDIR=" #$output)
+              "PREFIX=")
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'configure
+            (lambda* (#:key inputs native-inputs #:allow-other-keys)
+              (let ((esbuild (search-input-file (or native-inputs inputs)
+                                                "/bin/esbuild")))
+                (invoke esbuild
+                        "--platform=node"
+                        "--target=node10"
+                        "--outfile=bin/generate.js"
+                        "--bundle"
+                        "bin/generate.ts"))))
+          (add-before 'install 'create-install-directories
+            (lambda _
+              (mkdir #$output)
+              (with-directory-excursion #$output
+                (for-each mkdir (list "lib" "include" "src")))))
+          (add-after 'install 'install-src
+            (lambda _
+              (let ((src-dir (string-append #$output "/src")))
+                (install-file "build/c/llhttp.c" src-dir)
+                (install-file "src/native/api.c" src-dir)
+                (install-file "src/native/http.c" src-dir)))))))
     (native-inputs
-     `(("esbuild" ,esbuild)
-       ("node" ,node-bootstrap)
-       ("node-semver" ,node-semver-bootstrap)
-       ("node-llparse-bootstrap" ,node-llparse-bootstrap)))
+     (list esbuild
+           node-bootstrap
+           node-llparse-bootstrap
+           node-semver-bootstrap))
     (home-page "https://github.com/nodejs/llhttp")
     (properties '((hidden? . #t)))
     (synopsis "Parser for HTTP messages")