From c7e94de91f903f7484e2bd644de9c179d76973a8 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 10 Apr 2014 02:27:43 +0200 Subject: [PATCH] lxc: set rootfs path somewhere outside /nix/store This commit fixes lxc to eventually work --- pkgs/os-specific/linux/lxc/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 1fcdcbc2837a..12305687c299 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -14,10 +14,14 @@ stdenv.mkDerivation rec { patches = [ ./install-localstatedir-in-store.patch ./support-db2x.patch ]; - preConfigure = "export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; + preConfigure = '' + export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml + substituteInPlace doc/rootfs/Makefile.am --replace '@LXCROOTFSMOUNT@' '$out/lib/lxc/rootfs' + ''; configureFlags = [ "--localstatedir=/var" + "--with-rootfs-path=/var/lib/lxc/rootfs" "--enable-doc" "--enable-tests" "--enable-apparmor"