From abf21ba57838288b37f38ce49ca51825ef709743 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 9 Sep 2022 19:19:50 +0200 Subject: [PATCH] gnu: libcacard: Explicitly add NSS on RUNPATH. * gnu/packages/spice.scm (libcacard)[arguments]: New field. --- gnu/packages/spice.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 7ac82e5115..5d505b0ee2 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Rutger Helling -;;; Copyright © 2019, 2020 Marius Bakke +;;; Copyright © 2019, 2020, 2022 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,6 +47,7 @@ #:use-module (guix build-system meson) #:use-module (guix download) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils)) @@ -340,6 +341,13 @@ resolution scaling on graphical console window resize.") (base32 "1rrjlclm6ad63gah1fa4yfwrz4z6vgq2yrybbvzvvdbxrgl4vgzv")))) (build-system meson-build-system) + (arguments + (list #:configure-flags + ;; XXX: For some reason NSS is not automatically added on RUNPATH + ;; with newer versions of Meson (after 0.60). + #~(list (string-append "-Dc_link_args=-Wl,-rpath=" + (search-input-directory + %build-inputs "lib/nss"))))) (propagated-inputs (list glib ; Requires: in the pkg-config file nss ; Requires.private: in the pkg-config