Skip to content

Commit

Permalink
multipath-tools: clean up derivation (#318745)
Browse files Browse the repository at this point in the history
The upstream devs have pointed out[^1] that these sed commands are obsolete
and are responsible for issues with building the 0.9.9 release (not tagged yet)

[^1]: opensvc/multipath-tools#85 (comment)
  • Loading branch information
yuyuyureka authored Jun 12, 2024
1 parent b206de3 commit 0b3a8c0
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions pkgs/os-specific/linux/multipath-tools/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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=";
})
];

Expand All @@ -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 = [
Expand Down

0 comments on commit 0b3a8c0

Please sign in to comment.