public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Wrap the python scripts in lxc
This commit is contained in:
lethalman 2015-06-19 18:51:52 +02:00
commit f914a39d57
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/os-specific/linux/lxc/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, docbook2x { 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 , libapparmor ? null, gnutls ? null, libseccomp ? null, cgmanager ? null
, libnih ? null, dbus ? null, libcap ? null , libnih ? null, dbus ? null, libcap ? null, python3 ? null
}: }:
let let
@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
autoreconfHook pkgconfig perl docbook2x systemd 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 ]; patches = [ ./support-db2x.patch ];
@ -49,6 +50,8 @@ stdenv.mkDerivation rec {
"LXCPATH=\${TMPDIR}/var/lib/lxc" "LXCPATH=\${TMPDIR}/var/lib/lxc"
]; ];
postInstall = "wrapPythonPrograms";
meta = { meta = {
homepage = "http://lxc.sourceforge.net"; homepage = "http://lxc.sourceforge.net";
description = "userspace tools for Linux Containers, a lightweight virtualization system"; description = "userspace tools for Linux Containers, a lightweight virtualization system";
@ -63,6 +66,6 @@ stdenv.mkDerivation rec {
''; '';
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ simons wkennington ]; maintainers = with maintainers; [ simons wkennington globin ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -2046,7 +2046,9 @@ let
lshw = callPackage ../tools/system/lshw { }; 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 { }; lzip = callPackage ../tools/compression/lzip { };