diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-12 06:01:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-12 06:01:00 +0000 |
| commit | e145b7fb56806bd90267401d3b7bdc18189a792a (patch) | |
| tree | 7e52f726339f846d45f581294e9ce5fcc03dff51 /pkgs/os-specific | |
| parent | 477d2d32ff5e59c4c91bcd3a7cb61b320f2c18be (diff) | |
| parent | c9c6f48c478587803b3eb6e7ea8a1d252cd04b82 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/multipath-tools/default.nix | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index ebb8cc03d37c0..20b6ee0d7eb15 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -35,8 +35,7 @@ stdenv.mkDerivation rec { # Backport build fix for musl libc 1.2.5 (fetchpatch { url = "https://github.com/openSUSE/multipath-tools/commit/e5004de8296cd596aeeac0a61b901e98cf7a69d2.patch"; - hash = "sha256-ZvNFVphB9f+S/XMxktR6P/YYSTLeJXEsj4XrAnw6GUI="; - excludes = ["tests/util.c"]; + hash = "sha256-3Qt8zfrWi9aOdqMObZQaNAaXDmjhvSYrXK7qycC9L1Q="; }) ]; @@ -46,16 +45,6 @@ stdenv.mkDerivation rec { substituteInPlace multipathd/multipathd.service.in \ --replace-fail /sbin/multipathd "$out/bin/multipathd" - - sed -i -re ' - s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", - ' libmultipath/defaults.h - sed -i -e 's,\$(DESTDIR)/\(usr/\)\?,$(prefix)/,g' \ - kpartx/Makefile libmpathpersist/Makefile - sed -i -e "s,GZIP,GZ," \ - $(find * -name Makefile\*) - - sed '1i#include <assert.h>' -i tests/{util,vpd}.c ''; nativeBuildInputs = [ |