From c200d15c4fc4fff4e7c339608b083579f04b8539 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 12 Jul 2021 22:50:44 -0500 Subject: [PATCH 4/4] build: Use updated Uglifyjs for minify-build-system. * guix/build-system/minify.scm (default-uglify-js): Update uglify-js package used. * guix/build/minify-build-system.scm (minify): Use updated UglifyJs command name. --- guix/build-system/minify.scm | 4 ++-- guix/build/minify-build-system.scm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/build-system/minify.scm b/guix/build-system/minify.scm index 28a6781c06..9d53760685 100644 --- a/guix/build-system/minify.scm +++ b/guix/build-system/minify.scm @@ -44,8 +44,8 @@ (define (default-uglify-js) "Return the default package to minify JavaScript source files." ;; Lazily resolve the binding to avoid a circular dependency. - (let ((mod (resolve-interface '(gnu packages lisp-xyz)))) - (module-ref mod 'uglify-js))) + (let ((mod (resolve-interface '(gnu packages uglifyjs)))) + (module-ref mod 'uglifyjs))) (define* (lower name #:key source inputs native-inputs outputs system diff --git a/guix/build/minify-build-system.scm b/guix/build/minify-build-system.scm index 92158a033f..c5a876726f 100644 --- a/guix/build/minify-build-system.scm +++ b/guix/build/minify-build-system.scm @@ -39,7 +39,7 @@ (format #t "minifying ~a\n" file) (let* ((base (basename file ".js")) (installed (or target (string-append directory base ".min.js"))) - (minified (open-pipe* OPEN_READ "uglify-js" file))) + (minified (open-pipe* OPEN_READ "uglifyjs" file))) (call-with-output-file installed (cut dump-port minified <>)) #t)) -- 2.32.0