[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/26: gnu: belcard: Simplify by using G-expression.
From: |
guix-commits |
Subject: |
06/26: gnu: belcard: Simplify by using G-expression. |
Date: |
Sun, 9 Apr 2023 05:06:36 -0400 (EDT) |
rekado pushed a commit to branch core-updates
in repository guix.
commit 142899cd69e890d17690d4996d2e1dcb13b2d0f3
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Thu Apr 6 20:01:41 2023 +0200
gnu: belcard: Simplify by using G-expression.
* gnu/packages/linphone.scm (belcard)[arguments]: Rewrite as G-expression
and
remove all output lookups.
---
gnu/packages/linphone.scm | 59 ++++++++++++++++++++++-------------------------
1 file changed, 28 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index f713f2ff79..71ab01cae9 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -258,37 +258,34 @@ IETF.")
(build-system cmake-build-system)
(outputs '("out" "debug" "tester"))
(arguments
- `(#:configure-flags '("-DENABLE_STATIC=OFF")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-vcard-grammar-location
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (vcard-grammar
- (string-append out "/share/belr/grammars/vcard_grammar")))
- (substitute* "include/belcard/vcard_grammar.hpp"
- (("define VCARD_GRAMMAR \"vcard_grammar\"")
- (format #f "define VCARD_GRAMMAR ~s" vcard-grammar))))))
- (add-after 'install 'install-tester
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (tester (assoc-ref outputs "tester"))
- (test-name (string-append ,name "_tester")))
- (for-each mkdir-p
- (list (string-append tester "/bin")
- (string-append tester "/share")))
- (rename-file (string-append out "/bin/" test-name)
- (string-append tester "/bin/" test-name))
- (rename-file (string-append out "/share/" test-name)
- (string-append tester "/share/" test-name)))))
- (delete 'check)
- (add-after 'install-tester 'check
- (lambda* (#:key inputs outputs tests? #:allow-other-keys)
- (when tests?
- (let* ((tester (assoc-ref outputs "tester"))
- (belcard_tester (string-append tester
- "/bin/belcard_tester")))
- (invoke belcard_tester))))))))
+ (list
+ #:configure-flags '(list "-DENABLE_STATIC=OFF")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-vcard-grammar-location
+ (lambda _
+ (let ((vcard-grammar
+ (string-append #$output
+ "/share/belr/grammars/vcard_grammar")))
+ (substitute* "include/belcard/vcard_grammar.hpp"
+ (("define VCARD_GRAMMAR \"vcard_grammar\"")
+ (format #f "define VCARD_GRAMMAR ~s" vcard-grammar))))))
+ (add-after 'install 'install-tester
+ (lambda _
+ (let ((test-name (string-append #$name "_tester")))
+ (for-each mkdir-p
+ (list (string-append #$output:tester "/bin")
+ (string-append #$output:tester "/share")))
+ (rename-file (string-append #$output "/bin/" test-name)
+ (string-append #$output:tester "/bin/" test-name))
+ (rename-file (string-append #$output "/share/" test-name)
+ (string-append #$output:tester "/share/"
test-name)))))
+ (delete 'check)
+ (add-after 'install-tester 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke (string-append #$output:tester
+ "/bin/belcard_tester"))))))))
(inputs
(list bctoolbox belr))
(synopsis "Belledonne Communications VCard Library")
- branch core-updates updated (57627eedc8 -> 03580b5f1d), guix-commits, 2023/04/09
- 02/26: gnu: bctoolbox: Drop input labels., guix-commits, 2023/04/09
- 03/26: gnu: bctoolbox: Update to 5.2.49., guix-commits, 2023/04/09
- 01/26: gnu: bctoolbox: Run tests conditionally., guix-commits, 2023/04/09
- 10/26: gnu: libcutl: Use GCC 10., guix-commits, 2023/04/09
- 07/26: gnu: belle-sip: Update to 5.2.49., guix-commits, 2023/04/09
- 04/26: gnu: belr: Update to 5.2.49., guix-commits, 2023/04/09
- 06/26: gnu: belcard: Simplify by using G-expression.,
guix-commits <=
- 08/26: gnu: soci: Update to 4.0.3., guix-commits, 2023/04/09
- 23/26: gnu: Add openldap-for-linphone., guix-commits, 2023/04/09
- 05/26: gnu: belcard: Update to 5.2.49., guix-commits, 2023/04/09
- 16/26: gnu: bcmatroska2: Update to 5.2.1., guix-commits, 2023/04/09
- 11/26: gnu: ortp: Use G-expression., guix-commits, 2023/04/09
- 17/26: gnu: mediastreamer2: Use G-expression., guix-commits, 2023/04/09
- 21/26: gnu: libxsd-frontend: Build with GCC 10., guix-commits, 2023/04/09
- 24/26: gnu: liblinphone: Update to 5.2.50., guix-commits, 2023/04/09
- 25/26: gnu: linphone-desktop: Update to 5.0.14., guix-commits, 2023/04/09
- 09/26: gnu: lime: Update to 5.2.49., guix-commits, 2023/04/09