mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-18 02:05:51 +03:00
Merge pull request #292137 from seanybaggins/add-mingw-support-lzip
lzip: fix mingw regression
This commit is contained in:
commit
144b44e99c
@ -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 = [
|
||||
|
13
pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch
Normal file
13
pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch
Normal file
@ -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
|
Loading…
Reference in New Issue
Block a user