summary refs log tree commit diff
path: root/pkgs/os-specific/linux/lvm2
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-08-16 15:36:25 -0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-08-16 15:37:36 -0400
commit548365b95c310fff8c7d3cfa57860db7f853e3c0 (patch)
treefe5f1f649b1351e4b931f213db6ac8b1204af5b0 /pkgs/os-specific/linux/lvm2
parentca84b7ff22a68090156564f992bd572f0335965a (diff)
downloadnixpkgs-548365b95c310fff8c7d3cfa57860db7f853e3c0.tar
nixpkgs-548365b95c310fff8c7d3cfa57860db7f853e3c0.tar.gz
nixpkgs-548365b95c310fff8c7d3cfa57860db7f853e3c0.tar.bz2
nixpkgs-548365b95c310fff8c7d3cfa57860db7f853e3c0.tar.lz
nixpkgs-548365b95c310fff8c7d3cfa57860db7f853e3c0.tar.xz
nixpkgs-548365b95c310fff8c7d3cfa57860db7f853e3c0.tar.zst
nixpkgs-548365b95c310fff8c7d3cfa57860db7f853e3c0.zip
lvm2: Update to 2.02.97
Diffstat (limited to 'pkgs/os-specific/linux/lvm2')
-rw-r--r--pkgs/os-specific/linux/lvm2/default.nix25
1 files changed, 21 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 3411bc83d8a..1ebebfd634b 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, udev }:
+{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }:
 
 let
-  v = "2.02.95";
+  v = "2.02.97";
 in
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${v}.tgz";
-    sha256 = "09cixpdrbzjybf8k8f0rsgkriyvbaj2acmfsg1bzxnjil4vayd83";
+    sha256 = "0azwa555dgvixbdw055yj8cj1q6kd0a36nms005iz7la5q0q5npd";
   };
 
   configureFlags =
@@ -17,11 +17,28 @@ stdenv.mkDerivation {
 
   buildInputs = [ pkgconfig udev ];
 
-  patches = [ ./purity.patch ];
+  preConfigure =
+    ''
+      substituteInPlace scripts/lvmdump.sh \
+        --replace /usr/bin/tr ${coreutils}/bin/tr
+      substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \
+        --replace /usr/sbin/lvm $out/sbin/lvm
+    '';
+
+  #patches = [ ./purity.patch ];
 
   # To prevent make install from failing.
   preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\"";
 
+  # Install systemd stuff.
+  #installTargets = "install install_systemd_generators install_systemd_units install_tmpfiles_configuration";
+
+  postInstall =
+    ''
+      substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \
+        --replace $out/sbin/blkid ${utillinux}/sbin/blkid
+    '';
+
   meta = {
     homepage = http://sourceware.org/lvm2/;
     descriptions = "Tools to support Logical Volume Management (LVM) on Linux";