aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-10-16 14:59:28 +0200
committerLudovic Courtès <ludo@gnu.org>2020-10-16 15:00:51 +0200
commit27913a6d3862a858269ada931f51e0ba03912e8c (patch)
treea4909526102f9dd1af42e92f0d9c00d571983235
parent5dbfdf8be4dc6250ab8475874e232e653b042cbf (diff)
downloadguix-27913a6d3862a858269ada931f51e0ba03912e8c.tar.gz
guix-27913a6d3862a858269ada931f51e0ba03912e8c.zip
gnu: gnuzilla: Use 'assume-valid-file-name' where appropriate.
This avoids spurious 'local-file' warnings when running "make". * gnu/packages/gnuzilla.scm (icecat-source): Wrap 'search-patch' calls in 'assume-valid-file-name'.
-rw-r--r--gnu/packages/gnuzilla.scm10
1 files changed, 7 insertions, 3 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index af436a1dfd..4dbe864598 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
@@ -591,10 +591,14 @@ from forcing GEXP-PROMISE."
(base32
"0266gp8vs4avlfdnr8dj7b47msxv1vkd0xpnifp04v4scvgj0yaj"))))
+ ;; 'search-patch' returns either a valid file name or #f, so wrap it
+ ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
(gnuzilla-fixes-patch
- (local-file (search-patch "icecat-use-older-reveal-hidden-html.patch")))
+ (local-file (assume-valid-file-name
+ (search-patch "icecat-use-older-reveal-hidden-html.patch"))))
(makeicecat-patch
- (local-file (search-patch "icecat-makeicecat.patch"))))
+ (local-file (assume-valid-file-name
+ (search-patch "icecat-makeicecat.patch")))))
(origin
(method computed-origin-method)