Leo Famulari <l...@famulari.name> writes:
> On Sat, Aug 13, 2016 at 07:48:36PM +0100, Marius Bakke wrote:
>> Note that it bundles googletest; I tried unbundling but it proved
>> difficult. gtest will no longer be used from the 0.6 release so I did
>> not think a comment was necessary.
>
> I am cc-ing Lukas with my reply, since he added our googletest package.
> Maybe he has some insight.
The problem is that their autotools system expects to build gtest as
well, so there are references all over. See:
https://github.com/sandstorm-io/capnproto/blob/release-0.5.3/c%2B%2B/Makefile.am
and also configure.ac. It would have to be patched out, which seems
excessive for a 4MB build dependency.
>> * gnu/packages/capnproto.scm: New file.
>> * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
>
> How about putting it in serialization.scm?
Oops, missed that. Thanks.
>> + (snippet
>> + ;; Workaround for test that tries to resolve port name from
>> + ;; /etc/services, which is not present in build environment.
>> + '(substitute* "src/kj/async-io-test.c++" ((":http")
>> ":80")))))
>
>
> Origin snippets affect the result of `guix build --source`, and I think
> their use should be limited to fixing critical bugs or software freedom
> problems. This is working around a peculiarity of our build system, so I
> think we should do it in a build phase, with modify-phases.
That makes sense, thanks for the clarification. Please find updated
patch below.
-- Marius
>From 6672014e1b6018dcdf0286daa5624d5095e1c6b1 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mba...@fastmail.com>
Date: Sat, 13 Aug 2016 19:01:49 +0100
Subject: [PATCH] gnu: Add capnproto.
* gnu/packages/serialization.scm (capnproto): New variable.
---
gnu/packages/serialization.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 42bb2b8..ec1d6ed 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Ricardo Wurmus <rek...@elephly.net>
;;; Copyright © 2016 Lukas Gradl <lgr...@openmailbox.org>
+;;; Copyright © 2016 Marius Bakke <mba...@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -123,3 +124,32 @@ such as compact binary encodings, XML, or JSON.")
(description "Msgpack is a library for C/C++ that implements binary
serialization.")
(license license:boost1.0)))
+
+(define-public capnproto
+ (package
+ (name "capnproto")
+ (version "0.5.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://capnproto.org/capnproto-c++-";
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1yvaadhgakskqq5wpv53hd6fc3pp17mrdldw4i5cvgck4iwprcfd"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'do-not-require-/etc/services
+ (lambda _
+ ;; Workaround for test that tries to resolve port name from
+ ;; /etc/services, which is not present in build environment.
+ (substitute* "src/kj/async-io-test.c++" ((":http") ":80"))
+ #t)))))
+ (home-page "https://capnproto.org";)
+ (synopsis "Capability-based RPC and serialization system")
+ (description
+ "Cap'n Proto is a very fast data interchange format and capability-based
+RPC system. Think JSON, except binary. Or think Protocol Buffers, except faster.")
+ (license license:expat)))
--
2.9.2
