diff options
| author | Sean Link <sean.link@lightdeckdx.com> | 2024-02-29 15:27:50 -0700 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-01 07:15:22 +0100 |
| commit | 366d67dfa43694afcbb326d59319ec7253a2360b (patch) | |
| tree | b02ef58225c8ca5a162f8463431e855671c0d114 /pkgs/tools/compression | |
| parent | 5d1b96ebf291b4d0695613d914914d163e99638d (diff) | |
lzip: fix mingw regression
Broken by the last lzip upgrade.
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/lzip/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 3a5d62b8092d..cbf789d1bbf1 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -17,6 +17,9 @@ stdenv.mkDerivation rec { patches = lib.optionals stdenv.hostPlatform.isMinGW [ ./mingw-install-exe-file.patch + # https://lists.nongnu.org/archive/html/lzip-bug/2024-02/msg00015.html + # patch provided by upstream, to be removed in the next release + ./mingw-mkdir-one-argument.patch ]; configureFlags = [ diff --git a/pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch b/pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch new file mode 100644 index 000000000000..efa0d8e3a067 --- /dev/null +++ b/pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch @@ -0,0 +1,13 @@ +--- lzip-1.24/main.cc 2024-01-26 00:08:47.000000000 +0100 ++++ lzip-1.24.1/src/main.cc 2024-02-06 16:04:00.000000000 +0100 +@@ -42,8 +42,10 @@ + #if defined __MSVCRT__ || defined __OS2__ || defined __DJGPP__ + #include <io.h> + #if defined __MSVCRT__ ++#include <direct.h> + #define fchmod(x,y) 0 + #define fchown(x,y,z) 0 ++#define mkdir(name,mode) _mkdir(name) + #define strtoull std::strtoul + #define SIGHUP SIGTERM + #define S_ISSOCK(x) 0 |