diff options
author | Neil Mayhew <neil_mayhew@users.sourceforge.net> | 2020-06-02 08:50:01 -0600 |
---|---|---|
committer | Neil Mayhew <neil_mayhew@users.sourceforge.net> | 2020-06-02 09:38:29 -0600 |
commit | 367b3a99e4112473464ee06b9989e4ed4bbed306 (patch) | |
tree | ea0057b848fd9e5c21f9ba2215a167402c364466 /pkgs | |
parent | 15ed0ead0538996276c69da7baadf831fd4f1817 (diff) |
multipath-tools: Fix build failure due to GZIP make var
The multipath-tools makefiles use GZIP as a variable name but this is also the name of the environment variable gzip uses to get its default options. Normally, this wouldn't get into the environment but nixpkgs exports GZIP=-n in a setup hook. This in turn causes make to export its own value for this variable. gzip objects to having -c in the environment variable and aborts, causing the build to fail.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/multipath-tools/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 7e5ce115db4a1..d60b4a9a549dc 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { ' libmultipath/defaults.h sed -i -e 's,\$(DESTDIR)/\(usr/\)\?,$(prefix)/,g' \ kpartx/Makefile libmpathpersist/Makefile - sed -i -e "s,GZIP = .*, GZIP = gzip -9n -c," \ - Makefile.inc + sed -i -e "s,GZIP,GZ," \ + $(find * -name Makefile\*) ''; nativeBuildInputs = [ gzip pkgconfig perl ]; |