Change-Id: I089d53611a996e44cb9a92986c2b8de9cb69634f --- gnu/packages/virtualization.scm | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 398b332dd6..a509feea2a 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2024 Janneke Nieuwenhuizen <jann...@gnu.org> ;;; Copyright © 2024 Raven Hallsby <k...@hallsby.com> ;;; Copyright © 2024 jgart <jg...@dismail.de> +;;; Copyright © 2024 Jakob Kirsch <jakob.kir...@web.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1349,7 +1350,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 @@ -1357,30 +1358,24 @@ (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") #: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")))))) + (delete 'shrink-runpath)))) (synopsis "Linux container tools") (home-page "https://linuxcontainers.org/") (description base-commit: 778dd796bff808f1f8520533bab239ecbe83cd87 -- 2.45.2