From 64c003f97f4c0330e1586b20c9c3547b8e9a1edd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 Aug 2008 14:14:55 +0000
Subject: * Partially reverted r12554: don't build devicemapper and lvm2 with  
 makeStaticBinaries, because it stubbornly tries to build dynamic   libraries
 as well.

svn path=/nixpkgs/trunk/; revision=12633
---
 pkgs/os-specific/linux/lvm2/default.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'pkgs/os-specific/linux/lvm2')

diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 04187d8c128..d33de1bd50e 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,13 +1,21 @@
-{stdenv, fetchurl, devicemapper}:
+{stdenv, fetchurl, devicemapper, enableStatic ? true}:
+
+assert enableStatic -> devicemapper.enableStatic;
 
 stdenv.mkDerivation {
-  name = "lvm2-2.02.38";
+  name = "lvm2-2.02.39";
+  
   src = fetchurl {
-    url = ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.38.tgz;
-    sha256 = "13nx6iqgga3ric51b36p15cxzhmh83s7spb2559iz3s24x4s0845";
+    url = ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.39.tgz;
+    sha256 = "18nfy7lj9fjjqjjd9dmb4v8away7cpi51ss1k8gd0yrh77dbsyyh";
   };
+  
   buildInputs = [devicemapper];
-  configureFlags = if stdenv ? isStatic then "--enable-static_link" else "";
+
+  inherit enableStatic;
+  
+  configureFlags = "--disable-readline ${if enableStatic then "--enable-static_link" else ""}";
+  
   # To prevent make install from failing.
   preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\"";
 }
-- 
cgit 1.4.1