Unverified Commit 144b44e9 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #292137 from seanybaggins/add-mingw-support-lzip 

lzip: fix mingw regression
parents f7fca9d9 366d67df

pkgs/tools/compression/lzip/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -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 = [

pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
--- 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