summary refs log tree commit diff
path: root/pkgs/os-specific/linux/lxc/default.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2013-04-15 11:15:55 +0200
committerPeter Simons <simons@cryp.to>2013-04-15 11:15:55 +0200
commit8fee4ad060069b1b4cf1e7571356197ab5fe7785 (patch)
tree511dd20f021d47727a4af11d3701758447baba59 /pkgs/os-specific/linux/lxc/default.nix
parent2974309fbdd5ecfb03f14e33b73a406bf09f410f (diff)
downloadnixpkgs-8fee4ad060069b1b4cf1e7571356197ab5fe7785.tar
nixpkgs-8fee4ad060069b1b4cf1e7571356197ab5fe7785.tar.gz
nixpkgs-8fee4ad060069b1b4cf1e7571356197ab5fe7785.tar.bz2
nixpkgs-8fee4ad060069b1b4cf1e7571356197ab5fe7785.tar.lz
nixpkgs-8fee4ad060069b1b4cf1e7571356197ab5fe7785.tar.xz
nixpkgs-8fee4ad060069b1b4cf1e7571356197ab5fe7785.tar.zst
nixpkgs-8fee4ad060069b1b4cf1e7571356197ab5fe7785.zip
lxc: update to version 0.9.0
Diffstat (limited to 'pkgs/os-specific/linux/lxc/default.nix')
-rw-r--r--pkgs/os-specific/linux/lxc/default.nix25
1 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 8f60ff2554b..c2a9deaa11f 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -1,34 +1,33 @@
 { stdenv, fetchurl, libcap, apparmor, perl, docbook2x, docbook_xml_dtd_45 }:
 
 stdenv.mkDerivation rec {
-  name = "lxc-0.8.0";
+  name = "lxc-0.9.0";
 
   src = fetchurl {
     url = "http://lxc.sf.net/download/lxc/${name}.tar.gz";
-    sha256 = "0b3912mal1n56i1v5f3aplm7shqnlz24p0znpva27r4l1drk7j7a";
+    sha256 = "0821clxymkgp71n720xj5ngs22s2v8jks68f5j4vypycwvm6f5qy";
   };
 
   buildInputs = [ libcap apparmor perl docbook2x ];
 
   patches = [
-   ./dont-run-ldconfig.patch
-   ./fix-documentation-build.patch
-   ./fix-sgml-documentation.patch
+    ./dont-run-ldconfig.patch
+    ./install-localstatedir-in-store.patch
+    ./support-db2x.patch
   ];
 
   preConfigure = "export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
 
-  configureFlags = "--localstatedir=/var";
-
-  postInstall = ''
-    cd "$out/lib"
-    lib=liblxc.so.?.*
-    ln -s $lib $(echo $lib | sed -re 's/(liblxc[.]so[.].)[.].*/\1/')
-  '';
+  configureFlags = [
+    "--localstatedir=/var"
+    "--enable-doc"
+    "--enable-tests"
+    "--enable-apparmor"
+  ];
 
   meta = {
     homepage = "http://lxc.sourceforge.net";
-    description = "lightweight virtual system mechanism";
+    description = "userspace tools for Linux Containers, a lightweight virtualization system";
     license = stdenv.lib.licenses.lgpl21Plus;
 
     longDescription = ''