summary refs log tree commit diff
path: root/pkgs/tools/system/lxc/default.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2011-09-23 11:16:10 +0000
committerPeter Simons <simons@cryp.to>2011-09-23 11:16:10 +0000
commit730afe1f8b6008baa3c41348274d3481259d4239 (patch)
tree0b087d4258f79cd9e9c8fa7d60f3a1a642de6ecb /pkgs/tools/system/lxc/default.nix
parent8e6bbd66aa3718c9559d292a91efe3e07e32ec04 (diff)
downloadnixpkgs-730afe1f8b6008baa3c41348274d3481259d4239.tar
nixpkgs-730afe1f8b6008baa3c41348274d3481259d4239.tar.gz
nixpkgs-730afe1f8b6008baa3c41348274d3481259d4239.tar.bz2
nixpkgs-730afe1f8b6008baa3c41348274d3481259d4239.tar.lz
nixpkgs-730afe1f8b6008baa3c41348274d3481259d4239.tar.xz
nixpkgs-730afe1f8b6008baa3c41348274d3481259d4239.tar.zst
nixpkgs-730afe1f8b6008baa3c41348274d3481259d4239.zip
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
Diffstat (limited to 'pkgs/tools/system/lxc/default.nix')
-rw-r--r--pkgs/tools/system/lxc/default.nix22
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/tools/system/lxc/default.nix b/pkgs/tools/system/lxc/default.nix
index 3d9e0f740b5..a4e44160a52 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 ];
+
+  patchPhase = "sed -i -e 's|/sbin/ldconfig|:|' src/lxc/Makefile.in";
 
-  configureFlags = [ "--localstatedir=/var" ];
+  configureFlags = "--localstatedir=/var";
 
-  postInstall = '' 
+  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 ];
   };
 }