Commit f914a39d authored by lethalman's avatar lethalman
Browse files

Merge pull request #8151 from globin/lxc-python-wrapping 

Wrap the python scripts in lxc
parents 087ded31 45be5244

pkgs/os-specific/linux/lxc/default.nix

+7 −4
Original line number Diff line number Diff line 
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, docbook2x

, docbook_xml_dtd_45, systemd

, docbook_xml_dtd_45, systemd, wrapPython

, libapparmor ? null, gnutls ? null, libseccomp ? null, cgmanager ? null

, libnih ? null, dbus ? null, libcap ? null

, libnih ? null, dbus ? null, libcap ? null, python3 ? null

}:



let
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec { 


  buildInputs = [

    autoreconfHook pkgconfig perl docbook2x systemd

    libapparmor gnutls libseccomp cgmanager libnih dbus libcap

    libapparmor gnutls libseccomp cgmanager libnih dbus libcap python3

    wrapPython

  ];



  patches = [ ./support-db2x.patch ];
@@ -49,6 +50,8 @@ stdenv.mkDerivation rec { 
    "LXCPATH=\${TMPDIR}/var/lib/lxc"

  ];



  postInstall = "wrapPythonPrograms";



  meta = {

    homepage = "http://lxc.sourceforge.net";

    description = "userspace tools for Linux Containers, a lightweight virtualization system";
@@ -63,6 +66,6 @@ stdenv.mkDerivation rec { 
    '';



    platforms = platforms.linux;

    maintainers = with maintainers; [ simons wkennington ];

    maintainers = with maintainers; [ simons wkennington globin ];

  };

}

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -2046,7 +2046,9 @@ let 


  lshw = callPackage ../tools/system/lshw { };



  lxc = callPackage ../os-specific/linux/lxc { };

  lxc = callPackage ../os-specific/linux/lxc {

    wrapPython = python3Packages.wrapPython;

  };



  lzip = callPackage ../tools/compression/lzip { };