* gnu/packages/virtualization.scm (lxc): Update to 6.0.1. [build-system]: Change to meson-build-system. [inputs]: Add dbus. [arguments]: Replace "--docdir=..." with "-Ddoc-path=...". Replace "--sysconfdir=/etc" with "-Ddistrosysconfdir=/etc". Remove "--localstatedir=/var". Add "-Dinit-script=sysvinit". Add "-Dinstall-state-dirs=false". Add "-Dinstall-init-files=false". Add "-Dspecfile=false". Add "-Db_lto=false". <#:phases>: No longer replace 'install. Add 'delete-static-init
Change-Id: I089d53611a996e44cb9a92986c2b8de9cb69634f --- gnu/packages/virtualization.scm | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index eaa7a8a264..0182c5d59e 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2024 Raven Hallsby <[email protected]> ;;; Copyright © 2024 jgart <[email protected]> ;;; Copyright © 2024 Ashish SHUKLA <[email protected]> +;;; Copyright © 2024 Jakob Kirsch <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1350,7 +1351,7 @@ (define-public libosinfo (define-public lxc (package (name "lxc") - (version "4.0.12") + (version "6.0.1") (source (origin (method url-fetch) (uri (string-append @@ -1358,30 +1359,27 @@ (define-public lxc version ".tar.gz")) (sha256 (base32 - "1vyk2j5w9gfyh23w3ar09cycyws16mxh3clbb33yhqzwcs1jy96v")))) - (build-system gnu-build-system) + "1q3p3zzm338pmc97z6ly8cjginkyljxqbk1c37l2xa46vfy8zcyc")))) + (build-system meson-build-system) (native-inputs (list pkg-config docbook2x)) (inputs - (list gnutls libcap libseccomp libselinux)) + (list gnutls libcap libseccomp libselinux dbus)) (arguments (list #:configure-flags - #~(list (string-append "--docdir=" #$output "/share/doc/" + #~(list (string-append "-Ddoc-path=" #$output "/share/doc/" #$name "-" #$version) - "--sysconfdir=/etc" - "--localstatedir=/var") + "-Ddistrosysconfdir=/etc" + "-Dinit-script=sysvinit" + "-Dinstall-state-dirs=false" + "-Dinstall-init-files=false" + "-Dspecfile=false" + "-Db_lto=false") #:phases #~(modify-phases %standard-phases - (replace 'install - (lambda _ - (invoke "make" "install" - (string-append "bashcompdir=" #$output - "/etc/bash_completion.d") - ;; Don't install files into /var and /etc. - "LXCPATH=/tmp/var/lib/lxc" - "localstatedir=/tmp/var" - "sysconfdir=/tmp/etc" - "sysconfigdir=/tmp/etc/default")))))) + ;; shrink-runpath doesn't like this file and it's unecessary, so we'll delete it + (add-before 'shrink-runpath 'delete-static-init + (lambda _ (delete-file (string-append #$output "/sbin/init.lxc.static"))))))) (synopsis "Linux container tools") (home-page "https://linuxcontainers.org/";) (description base-commit: 1b6ce1796abdf497f61f426d61339318f4f4f23d -- 2.46.0
