p7zip: 17.01 -> 17.03

2 files changed, 10 insertions, 55 deletions

diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 610e89c2fc3..90602cd42d8 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -1,21 +1,15 @@
-{ stdenv, fetchFromGitHub, lib, enableUnfree ? false }:
+{ stdenv, fetchFromGitHub, fetchpatch, lib, enableUnfree ? false }:
 
 stdenv.mkDerivation rec {
   pname = "p7zip";
-  version = "17.01";
-
+  version = "17.03";
 
   src = fetchFromGitHub {
     owner  = "szcnick";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0gczdmypwbfnxzb11rjrrndjkkb3jzxfby2cchn5j8ysny13mfps";
-  }
-  ;
-
-  patches = [
-    ./gcc10.patch
-  ];
+    sha256 = "0zgpa90z5p30jbpqydiig1h8hn41c76n2x26rh8cc92xw72ni33d";
+  };
 
   # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional
   postPatch = ''
@@ -35,12 +29,13 @@ stdenv.mkDerivation rec {
     find . -name makefile'*' -exec sed -i '/Rar/d' {} +
   '';
 
+  makeFlags = [ "DEST_HOME=${placeholder "out"}" ];
+
   preConfigure = ''
-    makeFlagsArray=(DEST_HOME=$out)
-      buildFlags=all3
-        '' + stdenv.lib.optionalString stdenv.isDarwin ''
-        cp makefile.macosx_llvm_64bits makefile.machine
-'';
+    buildFlags=all3
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    cp makefile.macosx_llvm_64bits makefile.machine
+  '';
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/archivers/p7zip/gcc10.patch b/pkgs/tools/archivers/p7zip/gcc10.patch
deleted file mode 100644
index 9361249af93..00000000000
--- a/pkgs/tools/archivers/p7zip/gcc10.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 1b7d2c73f01b2d2b6a3d2d16840e96e92afdcd61 Mon Sep 17 00:00:00 2001
-From: jinfeihan57 <jinfeihan57@gmail.com>
-Date: Tue, 9 Jun 2020 16:48:25 +0800
-Subject: [PATCH] gix gcc10 compiler error
-
----
- CPP/Windows/ErrorMsg.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CPP/Windows/ErrorMsg.cpp b/CPP/Windows/ErrorMsg.cpp
-index 99684ae..90a7e20 100644
---- a/CPP/Windows/ErrorMsg.cpp
-+++ b/CPP/Windows/ErrorMsg.cpp
-@@ -13,7 +13,7 @@ UString MyFormatMessage(DWORD errorCode)
-   const char * txt = 0;
-   AString msg;
- 
--  switch(errorCode) {
-+  switch(HRESULT(errorCode)) {
-     case ERROR_NO_MORE_FILES   : txt = "No more files"; break ;
-     case E_NOTIMPL             : txt = "E_NOTIMPL"; break ;
-     case E_NOINTERFACE         : txt = "E_NOINTERFACE"; break ;
-@@ -22,7 +22,7 @@ UString MyFormatMessage(DWORD errorCode)
-     case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ;
-     case E_OUTOFMEMORY         : txt = "E_OUTOFMEMORY"; break ;
-     case E_INVALIDARG          : txt = "E_INVALIDARG"; break ;
--    case ERROR_DIRECTORY          : txt = "Error Directory"; break ;
-+    case ERROR_DIRECTORY       : txt = "Error Directory"; break ;
-     default:
-       txt = strerror(errorCode);
-   }
-@@ -43,7 +43,7 @@ bool MyFormatMessage(DWORD messageID, CSysString &message)
-   const char * txt = 0;
-   AString msg;
- 
--  switch(messageID) {
-+  switch(HRESULT(messageID)) {
-     case ERROR_NO_MORE_FILES   : txt = "No more files"; break ;
-     case E_NOTIMPL             : txt = "E_NOTIMPL"; break ;
-     case E_NOINTERFACE         : txt = "E_NOINTERFACE"; break ;