diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2023-01-02 21:34:35 +0100 |
|---|---|---|
| committer | Thomas Gerbet <thomas@gerbet.me> | 2023-01-02 21:34:35 +0100 |
| commit | ad9521e07e188572fb64f4941b8eb770c7a7e20c (patch) | |
| tree | ffab5c51ace9b702fc19c6cf96fb21617282b245 /pkgs/os-specific/linux/multipath-tools | |
| parent | eae9a09270fe24991b7b6f47f7cfad57458d4fae (diff) | |
| download | nixpkgs-ad9521e07e188572fb64f4941b8eb770c7a7e20c.tar nixpkgs-ad9521e07e188572fb64f4941b8eb770c7a7e20c.tar.gz nixpkgs-ad9521e07e188572fb64f4941b8eb770c7a7e20c.tar.bz2 nixpkgs-ad9521e07e188572fb64f4941b8eb770c7a7e20c.tar.lz nixpkgs-ad9521e07e188572fb64f4941b8eb770c7a7e20c.tar.xz nixpkgs-ad9521e07e188572fb64f4941b8eb770c7a7e20c.tar.zst nixpkgs-ad9521e07e188572fb64f4941b8eb770c7a7e20c.zip | |
multipath-tools: 0.9.3 -> 0.9.4
https://github.com/opensvc/multipath-tools/compare/0.9.3...0.9.4 Fixed a bunch of issues and warnings occuring during the build. `passthru.tests` is however still broken.
Diffstat (limited to 'pkgs/os-specific/linux/multipath-tools')
| -rw-r--r-- | pkgs/os-specific/linux/multipath-tools/default.nix | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index d39da5fb9d7..2509b685051 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, coreutils , pkg-config , perl , lvm2 @@ -9,31 +10,28 @@ , systemd , liburcu , json_c -, kmod +, linuxHeaders , cmocka , nixosTests }: stdenv.mkDerivation rec { pname = "multipath-tools"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "opensvc"; repo = "multipath-tools"; rev = "refs/tags/${version}"; - sha256 = "sha256-pIGeZ+jB+6GqkfVN83axHIuY/BobQ+zs+tH+MkLIln0="; + sha256 = "sha256-CPvtnjzkyxKXrT8+YXaIgDA548h8X61+jCxMHKFfEyg="; }; postPatch = '' - substituteInPlace libmultipath/Makefile \ - --replace /usr/include/libdevmapper.h ${lib.getDev lvm2}/include/libdevmapper.h + substituteInPlace create-config.mk \ + --replace /bin/echo ${coreutils}/bin/echo - # systemd-udev-settle.service is deprecated. substituteInPlace multipathd/multipathd.service \ - --replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \ - --replace /sbin/multipathd "$out/bin/multipathd" \ - --replace " systemd-udev-settle.service" "" + --replace /sbin/multipathd "$out/bin/multipathd" sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", @@ -45,15 +43,16 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config perl ]; - buildInputs = [ systemd lvm2 libaio readline liburcu json_c ]; + buildInputs = [ systemd lvm2 libaio readline liburcu json_c linuxHeaders ]; makeFlags = [ "LIB=lib" "prefix=$(out)" + "systemd_prefix=$(out)" + "kernel_incdir=${linuxHeaders}/include/" "man8dir=$(out)/share/man/man8" "man5dir=$(out)/share/man/man5" "man3dir=$(out)/share/man/man3" - "SYSTEMDPATH=lib" ]; doCheck = true; |