From 730afe1f8b6008baa3c41348274d3481259d4239 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Sep 2011 11:16:10 +0000 Subject: [PATCH] lxc: added perl buildInput to fix the lxc-ps script Also added myself as a maintainer, improved the meta section a little, and stripped trailing whitespace. svn path=/nixpkgs/trunk/; revision=29450 --- pkgs/tools/system/lxc/default.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/system/lxc/default.nix b/pkgs/tools/system/lxc/default.nix index 3d9e0f740b5c..a4e44160a523 100644 --- a/pkgs/tools/system/lxc/default.nix +++ b/pkgs/tools/system/lxc/default.nix @@ -1,31 +1,33 @@ -{stdenv, fetchurl, libcap}: +{ stdenv, fetchurl, libcap, perl }: -stdenv.mkDerivation rec{ +let name = "lxc-0.7.5"; +in +stdenv.mkDerivation{ + inherit name; src = fetchurl { url = "http://lxc.sf.net/download/lxc/${name}.tar.gz"; sha256 = "019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c"; }; - patchPhase = '' - sed -i -e '/ldconfig/d' src/lxc/Makefile.in - ''; + buildInputs = [ libcap perl ]; - configureFlags = [ "--localstatedir=/var" ]; + patchPhase = "sed -i -e 's|/sbin/ldconfig|:|' src/lxc/Makefile.in"; - postInstall = '' + configureFlags = "--localstatedir=/var"; + + postInstall = '' cd "$out/lib" lib=liblxc.so.?.* ln -s $lib $(echo $lib | sed -re 's/(liblxc[.]so[.].)[.].*/\1/') ''; - buildInputs = [ libcap ]; - meta = { homepage = http://lxc.sourceforge.net; description = "lxc Linux Containers userland tools"; - license = "LGPLv2.1+"; + license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; }