diff options
author | William A. Kennington III <william@wkennington.com> | 2015-07-31 17:08:04 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-07-31 17:11:11 -0700 |
commit | 85e2c8ff23feb5f6344acde44d8b51d46c4ba89a (patch) | |
tree | c3299178825bda394469d4977553cd311c7a6271 /pkgs/os-specific/linux/lxc | |
parent | 7a6b3bf6880b45f1a55ff371564f5c91e26d781f (diff) |
lxc: Cleanup
Diffstat (limited to 'pkgs/os-specific/linux/lxc')
-rw-r--r-- | pkgs/os-specific/linux/lxc/default.nix | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 1c6847cce8226..c7170d5b46483 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, docbook2x -, docbook_xml_dtd_45, systemd, wrapPython -, libapparmor ? null, gnutls ? null, libseccomp ? null, cgmanager ? null -, libnih ? null, dbus ? null, libcap ? null, python3 ? null +, docbook_xml_dtd_45, python3Packages + +# Optional Dependencies +, libapparmor ? null, gnutls ? null, libselinux ? null, libseccomp ? null +, cgmanager ? null, libnih ? null, dbus ? null, libcap ? null, systemd ? null }: let @@ -18,10 +20,12 @@ stdenv.mkDerivation rec { sha256 = "149nq630h9bg87hb3cn086ci0cz29l7fp3i6qf1mqxv7hnildm8p"; }; + nativeBuildInputs = [ + autoreconfHook pkgconfig perl docbook2x python3Packages.wrapPython + ]; buildInputs = [ - autoreconfHook pkgconfig perl docbook2x systemd - libapparmor gnutls libseccomp cgmanager libnih dbus libcap python3 - wrapPython + libapparmor gnutls libselinux libseccomp cgmanager libnih dbus libcap + python3Packages.python systemd ]; patches = [ ./support-db2x.patch ]; @@ -31,17 +35,23 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" - "--with-rootfs-path=/var/lib/lxc/rootfs" + "--enable-doc" + "--disable-api-docs" ] ++ optional (libapparmor != null) "--enable-apparmor" - ++ optional (gnutls != null) "--enable-gnutls" + ++ optional (libselinux != null) "--enable-selinux" ++ optional (libseccomp != null) "--enable-seccomp" - ++ optional (enableCgmanager) "--enable-cgmanager" ++ optional (libcap != null) "--enable-capabilities" ++ [ - "--enable-doc" - "--enable-tests" + "--disable-examples" + "--enable-python" + "--disable-lua" + "--enable-bash" + (if doCheck then "--enable-tests" else "--disable-tests") + "--with-rootfs-path=/var/lib/lxc/rootfs" ]; + doCheck = false; + installFlags = [ "localstatedir=\${TMPDIR}" "sysconfdir=\${out}/etc" @@ -50,7 +60,9 @@ stdenv.mkDerivation rec { "LXCPATH=\${TMPDIR}/var/lib/lxc" ]; - postInstall = "wrapPythonPrograms"; + postInstall = '' + wrapPythonPrograms + ''; meta = { homepage = "http://lxc.sourceforge.net"; |