summary refs log tree commit diff
path: root/pkgs/os-specific/linux/multipath-tools
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2019-05-17 16:26:15 +0200
committerAndreas Rammhold <andreas@rammhold.de>2019-06-03 15:05:20 +0200
commitd436ab07182ffee2b3447df892828137fc3767e8 (patch)
tree466ca887ac60a3f32a90be28b429754b6da45ab2 /pkgs/os-specific/linux/multipath-tools
parent024a383d64036dab02157927369ca680427aa61d (diff)
downloadnixpkgs-d436ab07182ffee2b3447df892828137fc3767e8.tar
nixpkgs-d436ab07182ffee2b3447df892828137fc3767e8.tar.gz
nixpkgs-d436ab07182ffee2b3447df892828137fc3767e8.tar.bz2
nixpkgs-d436ab07182ffee2b3447df892828137fc3767e8.tar.lz
nixpkgs-d436ab07182ffee2b3447df892828137fc3767e8.tar.xz
nixpkgs-d436ab07182ffee2b3447df892828137fc3767e8.tar.zst
nixpkgs-d436ab07182ffee2b3447df892828137fc3767e8.zip
multipath-tools: 0.6.2 -> 0.8.1
Diffstat (limited to 'pkgs/os-specific/linux/multipath-tools')
-rw-r--r--pkgs/os-specific/linux/multipath-tools/default.nix13
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix
index 14996fd76be..0e90a081476 100644
--- a/pkgs/os-specific/linux/multipath-tools/default.nix
+++ b/pkgs/os-specific/linux/multipath-tools/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, lvm2, libaio, gzip, readline, systemd, liburcu }:
+{ stdenv, fetchurl, pkgconfig, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c }:
 
 stdenv.mkDerivation rec {
   name = "multipath-tools-${version}";
-  version = "0.6.2";
+  version = "0.8.1";
 
   src = fetchurl {
     name = "${name}.tar.gz";
-    url = "https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${version};sf=tgz";
-    sha256 = "159hxvbk9kh1qay9x04w0gsqzg0hkl5yghfc1wi9kv2n5pcwbkpm";
+    url = "https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=snapshot;h=refs/tags/${version};sf=tgz";
+    sha256 = "0669zl4dpai63dl04lf8vpwnpsff6qf19fifxfc4frawnh699k95";
   };
 
   postPatch = ''
+    substituteInPlace libmultipath/Makefile --replace /usr/include/libdevmapper.h ${lvm2}/include/libdevmapper.h
     sed -i -re '
       s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'",
     ' libmultipath/defaults.h
@@ -20,8 +21,8 @@ stdenv.mkDerivation rec {
       Makefile.inc
   '';
 
-  nativeBuildInputs = [ gzip ];
-  buildInputs = [ systemd lvm2 libaio readline liburcu ];
+  nativeBuildInputs = [ gzip pkgconfig perl ];
+  buildInputs = [ systemd lvm2 libaio readline liburcu json_c ];
 
   makeFlags = [
     "LIB=lib"