From e3ab05320ddd7b1305ccfbda55df29543f5e5883 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Tue, 20 Aug 2024 17:08:03 +0800 Subject: gnu: protobuf-c: Fix cross-compilation. * gnu/packages/protobuf.scm (protobuf-c): Fix cross-compilation. [native-inputs]: When cross-compilation, add protobuf. [arguments]<#:configure-flags>: When cross-compilation, Set PROTOC variable. Change-Id: Idd660f526b7c90277cb4399997cdb7ce72e4f1c5 Signed-off-by: Zheng Junjie --- gnu/packages/protobuf.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index d47b67fa61..b8679eff25 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2021 Felix Gruber -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -262,7 +262,17 @@ (define-public protobuf-c "17rk42r3gcc46c2svd1mxs542wnl4mi77a6klkhg6wl1a36zmi2c")))) (build-system gnu-build-system) (inputs (list protobuf)) - (native-inputs (list pkg-config)) + (native-inputs (append (if (%current-target-system) + (list protobuf) + '()) + (list pkg-config))) + (arguments (if (%current-target-system) + (list #:configure-flags + #~(list + (string-append + "PROTOC=" + (search-input-file %build-inputs "bin/protoc")))) + (list))) (home-page "https://github.com/protobuf-c/protobuf-c") (synopsis "Protocol Buffers implementation in C") (description -- cgit v1.2.3