aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/chromium.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-02-24 22:46:03 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-02-24 22:47:15 +0100
commit25590118ad1a9e93b9f438c668bf1de020fd36d2 (patch)
tree2f343a0d9f7e88f93d9e746b1f0f39681db8e40f /gnu/packages/chromium.scm
parent2e0787a5750dc4682505e284f3a0b399c99985db (diff)
downloadguix-25590118ad1a9e93b9f438c668bf1de020fd36d2.tar
guix-25590118ad1a9e93b9f438c668bf1de020fd36d2.tar.gz
gnu: Add ld wrapper variant that supports quotes in response files.
* gnu/packages/ld-wrapper-next.in: New file. * gnu/local.mk (MISC_DISTRO_FILES): Adjust accordingly. * gnu/packages/chromium.scm (ld-wrapper-next): New variable.
Diffstat (limited to 'gnu/packages/chromium.scm')
-rw-r--r--gnu/packages/chromium.scm15
1 files changed, 14 insertions, 1 deletions
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index 49ad8de84c..06e259b985 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -70,7 +70,8 @@
#:use-module (gnu packages xml)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
- #:use-module (ice-9 match))
+ #:use-module (ice-9 match)
+ #:use-module (srfi srfi-1))
(define %preserved-third-party-files
'("base/third_party/cityhash" ;Expat
@@ -423,6 +424,18 @@ from forcing GEXP-PROMISE."
`(cons "--enable-custom-modes"
,flags))))))
+;; Add a custom ld wrapper that supports quoted strings in response files.
+;; To be merged with 'ld-wrapper' in a future rebuild cycle.
+(define-public ld-wrapper-next
+ (let ((orig (car (assoc-ref (%final-inputs) "ld-wrapper"))))
+ (package
+ (inherit orig)
+ (name "ld-wrapper-next")
+ (inputs
+ `(("wrapper" ,(search-path %load-path
+ "gnu/packages/ld-wrapper-next.in"))
+ ,@(alist-delete "wrapper" (package-inputs orig)))))))
+
(define-public ungoogled-chromium
(package
(name "ungoogled-chromium")