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

* Partially reverted r12554: don't build devicemapper and lvm2 with

Browse Source 
makeStaticBinaries, because it stubbornly tries to build dynamic
  libraries as well.

svn path=/nixpkgs/trunk/; revision=12633
This commit is contained in:
Eelco Dolstra 2008-08-15 14:14:55 +00:00
parent 8582a0130a
commit 64c003f97f
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/os-specific/linux/device-mapper/default.nix
View File

@ -1,12 +1,17 @@
{stdenv, fetchurl}:
{stdenv, fetchurl, enableStatic ? true}:
stdenv.mkDerivation {
name = "device-mapper-1.02.26";
name = "device-mapper-1.02.27";
src = fetchurl {
url = ftp://sources.redhat.com/pub/dm/device-mapper.1.02.26.tgz;
sha256 = "0x905frw06s6k5p1rlc2hbgaphgalinarbdg82664sri0qmbkrfv";
url = ftp://sources.redhat.com/pub/dm/device-mapper.1.02.27.tgz;
sha256 = "1z4dldjjxfinwvg39x4m2cm5rcsbxs833g3phm34f5a2lwh7i6v6";
};
configureFlags = if stdenv ? isStatic then "--enable-static_link" else "";
inherit enableStatic;
configureFlags = if enableStatic then "--enable-static_link" else "";
# To prevent make install from failing.
installFlags = "OWNER= GROUP=";
}

18
pkgs/os-specific/linux/lvm2/default.nix
View File

@ -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\"";
}