diff options
| author | Efraim Flashner <[email protected]> | 2022-05-16 10:55:46 +0300 |
|---|---|---|
| committer | Efraim Flashner <[email protected]> | 2022-05-16 11:14:42 +0300 |
| commit | e5e0e283ffd92f153303401c39dfcc1d8dde4f96 (patch) | |
| tree | 82c7f8498081c1f807a0e4a25d0fd75c0e493043 /gnu/packages/javascript.scm | |
| parent | 7c204281ff0b57de59261cd7b68fab3df1c0f49c (diff) | |
| parent | 40a729a0e6f1d660b942241416c1e2c567616d4d (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/javascript.scm')
| -rw-r--r-- | gnu/packages/javascript.scm | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 68d338de8d..8ab8c46cd3 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2017 Arun Isaac <[email protected]> ;;; Copyright © 2017, 2019, 2020, 2022 Ricardo Wurmus <[email protected]> ;;; Copyright © 2017, 2018, 2020, 2021 Tobias Geerinckx-Rice <[email protected]> -;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner <[email protected]> +;;; Copyright © 2017, 2018, 2019, 2020, 2022 Efraim Flashner <[email protected]> ;;; Copyright © 2018 Nicolas Goaziou <[email protected]> ;;; Copyright © 2021 Pierre Neidhardt <[email protected]> ;;; Copyright © 2021 Maxim Cournoyer <[email protected]> @@ -34,6 +34,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages uglifyjs) #:use-module (gnu packages web) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -681,7 +682,7 @@ external server.") (define-public mujs (package (name "mujs") - (version "1.1.3") + (version "1.2.0") (source (origin (method git-fetch) @@ -690,19 +691,27 @@ external server.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0qizld89qw24i9v6i2j9cxjyqn425xbiqfp1b7qfrkyxqkn0byws")))) + (base32 "0kqw3xhjk4l2jar14a1f9b3m0xq0h2g3nc9m6hsdv7kf8jhfm83l")) + (snippet + #~(begin + (use-modules (guix build utils)) + (for-each delete-file + (list "astnames.h" + "opnames.h" + "one.c")))))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (replace 'install - (lambda* (#:key (make-flags '()) #:allow-other-keys) - (apply invoke "make" "install-shared" make-flags)))) + (list + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'install + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply invoke "make" "install-shared" make-flags)))) #:make-flags - (list ,(string-append "VERSION=" version) - ,(string-append "CC=" (cc-for-target)) - (string-append "prefix=" (assoc-ref %outputs "out"))) + #~(list (string-append "VERSION=" #$version) + (string-append "CC=" #$(cc-for-target)) + (string-append "prefix=" #$output)) #:tests? #f)) ; no tests (inputs (list readline)) |