public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #104912 from helsinki-systems/upd/p7zip 

p7zip: 17.01 -> 17.03
This commit is contained in:
Michael Raskin 2021-01-14 14:10:42 +00:00 committed by GitHub
parent 956afcd713 0004c16701
commit f62ab91aa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/tools/archivers/p7zip/default.nix
View File

@ -1,21 +1,15 @@
{ stdenv, fetchFromGitHub, lib, enableUnfree ? false }: { stdenv, fetchFromGitHub, fetchpatch, lib, enableUnfree ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "p7zip"; pname = "p7zip";
version = "17.01"; version = "17.03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "szcnick"; owner = "szcnick";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0gczdmypwbfnxzb11rjrrndjkkb3jzxfby2cchn5j8ysny13mfps"; sha256 = "0zgpa90z5p30jbpqydiig1h8hn41c76n2x26rh8cc92xw72ni33d";
} };
;
patches = [
./gcc10.patch
];
# Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional
postPatch = '' postPatch = ''
@ -35,12 +29,13 @@ stdenv.mkDerivation rec {
find . -name makefile'*' -exec sed -i '/Rar/d' {} + find . -name makefile'*' -exec sed -i '/Rar/d' {} +
''; '';
makeFlags = [ "DEST_HOME=${placeholder "out"}" ];
preConfigure = '' preConfigure = ''
makeFlagsArray=(DEST_HOME=$out) buildFlags=all3
buildFlags=all3 '' + stdenv.lib.optionalString stdenv.isDarwin ''
'' + stdenv.lib.optionalString stdenv.isDarwin '' cp makefile.macosx_llvm_64bits makefile.machine
cp makefile.macosx_llvm_64bits makefile.machine '';
'';
enableParallelBuilding = true; enableParallelBuilding = true;

40
pkgs/tools/archivers/p7zip/gcc10.patch
View File

@ -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 ;