From 517618b2401c2ab5861e63df60ae49918b94f727 Mon Sep 17 00:00:00 2001 From: Z572 <873216071@qq.com> Date: Thu, 1 Dec 2022 16:43:34 +0800 Subject: gnu: libtirpc: fix cross-compilation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/onc-rpc.scm (libtirpc)[native-inputs]: add mit-krb5. Signed-off-by: Ludovic Courtès --- gnu/packages/onc-rpc.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/onc-rpc.scm') diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index 873dc54c30..4495622191 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2022 Efraim Flashner +;;; Copyright © 2022 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,6 +64,7 @@ (define-public libtirpc "tirpc/netconfig.h") (("/etc/netconfig") (string-append (assoc-ref outputs "out") "/etc/netconfig")))))))) + (native-inputs (list mit-krb5)) ;; for cross-compilation (inputs (list mit-krb5)) (home-page "https://sourceforge.net/projects/libtirpc/") (synopsis "Transport-independent Sun/ONC RPC implementation") -- cgit v1.2.3 From 3532fc6ba4d36ae055f11245a29fb6e8e54c545c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 24 Dec 2022 00:35:32 +0100 Subject: gnu: libtirpc-hurd: Fix cross-compilation. Fixes a regression introduced in 517618b2401c2ab5861e63df60ae49918b94f727, whereby the "wrong" 'krb5-config' script would be picked. * gnu/packages/onc-rpc.scm (libtirpc/hurd)[arguments]: Turn #:configure-flags into a gexp to refer to the right "mit-krb5". --- gnu/packages/onc-rpc.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/onc-rpc.scm') diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index 4495622191..3928e80476 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2017, 2018 Ludovic Courtès +;;; Copyright © 2014, 2017, 2018, 2022 Ludovic Courtès ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice @@ -27,6 +27,7 @@ (define-module (gnu packages onc-rpc) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (gnu packages) #:use-module (gnu packages autotools) @@ -84,9 +85,9 @@ (define-public libtirpc/hurd (substitute-keyword-arguments (package-arguments libtirpc) ((#:configure-flags flags ''()) ;; When cross-building the target system's krb5-config should be used. - `(list (string-append "ac_cv_prog_KRB5_CONFIG=" - (assoc-ref %build-inputs "mit-krb5") - "/bin/krb5-config"))))))) + #~(list (string-append "ac_cv_prog_KRB5_CONFIG=" + #$(this-package-input "mit-krb5") + "/bin/krb5-config"))))))) (define libtirpc/fixed (package -- cgit v1.2.3