diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-08-15 14:14:55 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-08-15 14:14:55 +0000 |
| commit | 64c003f97f4c0330e1586b20c9c3547b8e9a1edd (patch) | |
| tree | 8c5388839bcb3e6368841810bb51ab3fd98cc535 /pkgs/os-specific/linux | |
| parent | 8582a0130ac0dce60a01b3522014de03c73b413c (diff) | |
| download | nixpkgs-64c003f97f4c0330e1586b20c9c3547b8e9a1edd.tar nixpkgs-64c003f97f4c0330e1586b20c9c3547b8e9a1edd.tar.gz nixpkgs-64c003f97f4c0330e1586b20c9c3547b8e9a1edd.tar.bz2 nixpkgs-64c003f97f4c0330e1586b20c9c3547b8e9a1edd.tar.lz nixpkgs-64c003f97f4c0330e1586b20c9c3547b8e9a1edd.tar.xz nixpkgs-64c003f97f4c0330e1586b20c9c3547b8e9a1edd.tar.zst nixpkgs-64c003f97f4c0330e1586b20c9c3547b8e9a1edd.zip | |
* 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
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/device-mapper/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/lvm2/default.nix | 18 |
2 files changed, 23 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/device-mapper/default.nix b/pkgs/os-specific/linux/device-mapper/default.nix index c8e52a43d11..d17cebe3fd5 100644 --- a/pkgs/os-specific/linux/device-mapper/default.nix +++ b/pkgs/os-specific/linux/device-mapper/default.nix @@ -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="; } 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\""; } |