diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-06 16:31:58 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-06 16:31:58 +0100 |
| commit | f339df425eb00cb8d9418b3a338d7e03afd4a09c (patch) | |
| tree | 63770d1bfb9325f843f20b2f2d793f291b42f8d8 /gnu/packages/virtualization.scm | |
| parent | e21bd8dff8e85635ef96c4bf043dda6539f604cd (diff) | |
| parent | 7016e62070b27d8e77e3ec7b4dd5e78653ade114 (diff) | |
| download | patches-f339df425eb00cb8d9418b3a338d7e03afd4a09c.tar patches-f339df425eb00cb8d9418b3a338d7e03afd4a09c.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 47e24460f9..5b5d5a518a 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -354,7 +354,7 @@ all common programming languages. Vala bindings are also provided.") (define-public lxc (package (name "lxc") - (version "3.0.2") + (version "3.1.0") (source (origin (method url-fetch) (uri (string-append @@ -362,7 +362,7 @@ all common programming languages. Vala bindings are also provided.") version ".tar.gz")) (sha256 (base32 - "0p1gy553cm4mhwxi85fl6qiwz61rjmvysm8c8pd20qh62xxi3dva")))) + "1igxqgx8q9cp15mcp1y8j564bl85ijw04jcmgb1s5bmfbg1751sd")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -372,9 +372,11 @@ all common programming languages. Vala bindings are also provided.") ("libseccomp" ,libseccomp) ("libselinux" ,libselinux))) (arguments - '(#:configure-flags - '("--sysconfdir=/etc" - "--localstatedir=/var") + `(#:configure-flags + (list (string-append "--docdir=" (assoc-ref %outputs "out") + "/share/doc/" ,name "-" ,version) + "--sysconfdir=/etc" + "--localstatedir=/var") #:phases (modify-phases %standard-phases (replace 'install |