From 3ee72b7379964467526dd8de88415ce363981ef8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 19 May 2015 23:48:55 -0700 Subject: [PATCH] lxc: Cleanup postInstall --- pkgs/os-specific/linux/lxc/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 0d80fe6d2b1b..8115aa1055be 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -41,18 +41,13 @@ stdenv.mkDerivation rec { "--enable-tests" ]; - installFlags = [ "DESTDIR=\${out}" ]; - - postInstall = '' - mv $out/$out/* $out - DIR=$out/$out - while rmdir $DIR 2>/dev/null; do - DIR="$(dirname "$DIR")" - done - - # Remove the unneeded var/lib directories - rm -rf $out/var - ''; + installFlags = [ + "localstatedir=\${TMPDIR}" + "sysconfdir=\${out}/etc" + "sysconfigdir=\${out}/etc/default" + "READMEdir=\${TMPDIR}/var/lib/lxc/rootfs" + "LXCPATH=\${TMPDIR}/var/lib/lxc" + ]; meta = { homepage = "http://lxc.sourceforge.net";