diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-01 17:40:51 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-01 17:40:51 +0100 |
| commit | f5e563e50a232492e57d609a95d96081a060ea17 (patch) | |
| tree | e329bce8fcbb72eac2ab8f0176227e2e2623d475 /gnu/packages/gnuzilla.scm | |
| parent | 1130929acfff30b3f179e6bb949b1b7d78b85b69 (diff) | |
| parent | 19464173bafdc42adfc8dd7277c491c40ddef66b (diff) | |
| download | patches-f5e563e50a232492e57d609a95d96081a060ea17.tar patches-f5e563e50a232492e57d609a95d96081a060ea17.tar.gz | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index f60f8070ea..16ed207cb1 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -866,8 +867,6 @@ from forcing GEXP-PROMISE." ;; practice somehow. See <http://hydra.gnu.org/build/378133>. #:validate-runpath? #f - #:imported-modules ,%cargo-build-system-modules ;for `generate-checksums' - #:configure-flags `("--enable-default-toolkit=cairo-gtk3" "--with-distribution-id=org.gnu" @@ -939,6 +938,8 @@ from forcing GEXP-PROMISE." ;; "--with-system-png" ) + #:imported-modules ,%cargo-utils-modules ;for `generate-checksums' + #:modules ((ice-9 ftw) (ice-9 rdelim) (ice-9 match) @@ -978,7 +979,7 @@ from forcing GEXP-PROMISE." (invoke "sh" "-c" "autoconf old-configure.in > old-configure"))) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda _ - (use-modules (guix build cargo-build-system)) + (use-modules (guix build cargo-utils)) (let ((null-file "/dev/null") (null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) (substitute* '("Cargo.lock" "servo/Cargo.lock") |