diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-02-05 22:08:06 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-05 22:08:06 +0100 |
commit | f10921c5ade56534633eae0da94da6e81aacc2aa (patch) | |
tree | 599d0256cc509f47a3e75ea1214d5374de51eee8 /gnu/packages/gnome.scm | |
parent | 0a83339bb1429332ee889e9a976aa214ae2ac0db (diff) | |
parent | 9d0dfd9a9a7c43363a4e140c20d49f119fe6f2e3 (diff) | |
download | patches-f10921c5ade56534633eae0da94da6e81aacc2aa.tar patches-f10921c5ade56534633eae0da94da6e81aacc2aa.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/gnome.scm')
-rw-r--r-- | gnu/packages/gnome.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2f6029fba5..5b658c90dc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2178,6 +2178,10 @@ from forcing GEXP-PROMISE." #+(canonical-package tar))) (invoke "tar" "xvf" #+upstream-source) (with-directory-excursion (string-append "librsvg-" #$version) + ;; The following crate(s) are needed in addition to the ones replaced: + (begin + (invoke + "tar" "xvf" #+(package-source rust-autocfg-0.1) "-C" "vendor")) (for-each (lambda (crate) (delete-file-recursively (string-append "vendor/" (car crate))) @@ -2187,7 +2191,7 @@ from forcing GEXP-PROMISE." ("approx" . #+(package-source rust-approx-0.3)) ("arrayvec" . #+(package-source rust-arrayvec-0.4)) ("atty" . #+(package-source rust-atty-0.2)) - ("autocfg" . #+(package-source rust-autocfg-0.1)) + ("autocfg" . #+(package-source rust-autocfg-1.0)) ("bitflags" . #+(package-source rust-bitflags-1)) ;; block 0.1 ("bstr" . #+(package-source rust-bstr-0.2)) @@ -2238,7 +2242,7 @@ from forcing GEXP-PROMISE." ("language-tags" . #+(package-source rust-language-tags-0.2)) ("lazy_static" . #+(package-source rust-lazy-static-1.3)) ("libc" . #+(package-source rust-libc-0.2)) -;; libm 0.1 + ("libm" . #+(package-source rust-libm-0.1)) ;; locale_config 0.3 ("log" . #+(package-source rust-log-0.4)) ("mac" . #+(package-source rust-mac-0.1)) |