[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/11: gnu: cgal: Remove duplicate licence directory.
From: |
guix-commits |
Subject: |
02/11: gnu: cgal: Remove duplicate licence directory. |
Date: |
Tue, 29 Jun 2021 00:45:03 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 13d938bead8e7b3972bfbd78ccc45e10d682875d
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Tue Jun 29 05:17:54 2021 +0200
gnu: cgal: Remove duplicate licence directory.
* gnu/packages/graphics.scm (cgal)[arguments]: Set CGAL_INSTALL_DOC_DIR
to match Guix's own default in #:configure-flags.
---
gnu/packages/graphics.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 9925a72..cc3a7c9 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -772,7 +772,12 @@ more.")
"0yjzq12ivizp23y7zqm30x20psv9gzwbcdrhyd3f7h0ds94m1c40"))))
(build-system cmake-build-system)
(arguments
- '(#:tests? #f)) ; no test target
+ `(#:configure-flags
+ ;; Prevent two mostly-duplicate directories. Use Guix's versioned
+ ;; default for licences instead of CGAL's unversioned one.
+ (list (string-append "-DCGAL_INSTALL_DOC_DIR=share/doc/"
+ ,name "-" ,version))
+ #:tests? #f)) ; no test target
(inputs
`(("mpfr" ,mpfr)
("gmp" ,gmp)
- branch master updated (7e435f6 -> 87e1c2f), guix-commits, 2021/06/29
- 01/11: gnu: cgal: Update to 5.2.2., guix-commits, 2021/06/29
- 03/11: gnu: photoflare: Update to 1.6.9., guix-commits, 2021/06/29
- 04/11: gnu: man-pages: Update to 5.12., guix-commits, 2021/06/29
- 05/11: gnu: powerstat: Update to 0.02.26., guix-commits, 2021/06/29
- 02/11: gnu: cgal: Remove duplicate licence directory.,
guix-commits <=
- 06/11: gnu: erofs-utils: Update to 1.3., guix-commits, 2021/06/29
- 08/11: gnu: libavif: Update to 0.9.2., guix-commits, 2021/06/29
- 09/11: gnu: remind: Update to 3.3.7., guix-commits, 2021/06/29
- 07/11: gnu: erofs-utils: Edit description., guix-commits, 2021/06/29
- 10/11: gnu: egl-wayland: Update to 1.1.7., guix-commits, 2021/06/29
- 11/11: Really revert commit a8b705252bdcb642999258859ada1c2f43706092., guix-commits, 2021/06/29