[PATCH] Bombadillo build fix

  • Done
  • quality assurance status badge
Details
2 participants
  • Christopher Baines
  • raingloom
Owner
unassigned
Submitted by
raingloom
Severity
normal
R
R
raingloom wrote on 21 Oct 2020 23:29
(name . Guix Patches)(address . guix-patches@gnu.org)
20201021232921.48d19496@riseup.net
Just a quick fix. install-licenses was trying to overwrite a file
installed by a previous (custom) phase, but copy-file failed with a
permission error.
From 8260d3981f83b1446465ede31c8230d149422f6c Mon Sep 17 00:00:00 2001
From: raingloom <raingloom@riseup.net>
Date: Wed, 21 Oct 2020 23:22:26 +0200
Subject: [PATCH] gnu: Don't try to copy LICENSE twice in Bombadillo.

* gnu/packages/web-browsers.scm (bombadillo)[arguments]:
Removed copy-file call for LICENSE.
---
gnu/packages/web-browsers.scm | 1 -
1 file changed, 1 deletion(-)

Toggle diff (14 lines)
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 862927242e..2220737daa 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -622,7 +622,6 @@ key-bindings and is fully configurable and extensible in Common Lisp.")
(pixdir (string-append sharedir "/pixmaps")))
(with-directory-excursion builddir
(install-file "bombadillo.desktop" appdir)
- (install-file "LICENSE" docdir)
(install-file "bombadillo.1" mandir)
(install-file "bombadillo-icon.png" pixdir)
#t)))))))
--
2.28.0
C
C
Christopher Baines wrote on 23 Oct 2020 18:27
(name . raingloom)(address . raingloom@riseup.net)(address . 44127-done@debbugs.gnu.org)
87a6wc3o2x.fsf@cbaines.net
raingloom <raingloom@riseup.net> writes:

Toggle quote (4 lines)
> Just a quick fix. install-licenses was trying to overwrite a file
> installed by a previous (custom) phase, but copy-file failed with a
> permission error.

I tweaked the commit message a bit, but I've pushed this now as
2371abcd0ece81d6b7ca3d03aff17c81bf8a5d85. Thanks!
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl+TBFZfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xd9Yw/9FWLIjMpEnh3X36XKTbsHTClHmUJF3Aib
TyxPk9mApEQFY0FOBMgqOyduW5h/TYOoSwtYbJp2CTkRlV1MnXpzqzH2W1VCXRys
LWSlyxaI/Y6t2ubz3nMZ5B2GrpNG2yB78KdCeTHQXxBTkqmSBp0PuaocjJD9ENv6
KxTsXXMX+XymXEMuQfPHlgSBbYxIhnmq8G3pcEAh0lOcP4N8GpfI6gGLXOOFjBMR
HinKufoMxqf2MdNk9KhRPdhsri7HnEiAYMNZIA+k66Y1ZNJFfjDWTlbK8Q1uRraF
ID8OBue+muPgMDSUEiaGwD3CYUqnExN3Cbt7d9T02YI2zozlzagqz18vilpx+VFN
Qlt7g/pWI2KxdPEa+vBpDoDaH5tprsIhMTlOubMLM1MtXr5h1Bhgd92r379MaIWJ
DbD/IAEOBRqQr1RbDJa4oyUcsV0FXebfoFuDPwQj2vgnzB/mf0T04WxlMe7JFH5s
7yfWyOe7PGoa+IykHu6yBSOw1/bEgglcndh3XhvRqyFPnqujPbMokkFOwbxgatOr
WoRFZXv/OUw41LiyZ8/NI4pur74A9lXFnKh3jmAibdKpVuo9+s6BOy2ApGbtfpQU
5ZpCmkI+5pSpc7oAbujXWqxdLKQ3gjiTIPqFrmF/fPcSW/aPzkQj1AQXQXxmRRRD
53TPUKUDRQY=
=JUWf
-----END PGP SIGNATURE-----

Closed
?