mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
_7zz: replace fetchurl with fetchzip for stabler hashes
(cherry picked from commit 29cfb900f7
)
This commit is contained in:
parent
5b53daa6d6
commit
239e85bf1e
@ -1,6 +1,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchzip
|
||||
|
||||
# Only used for Linux's x86/x86_64
|
||||
, uasm
|
||||
@ -27,31 +27,22 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "7zz";
|
||||
version = "24.07";
|
||||
|
||||
src = fetchurl {
|
||||
src = fetchzip {
|
||||
url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz";
|
||||
hash = {
|
||||
free = "sha256-qVX4CViXsODmPZIPdHzG3xgCVDVb0qZ+1l3+I9wJg2o=";
|
||||
unfree = "sha256-0bCHSj8cJt8hx2GkowaR3BIT6Fd/GO54MmwUyk1oPis=";
|
||||
free = "sha256-D41Sf437WYRQMdVW7hwcnZI0UG67IJsTTMfxlpkk36M=";
|
||||
unfree = "sha256-iKCs893IFG0I6a2kpUe0qiuCX+YUxIgMIBRykc9XYjA=";
|
||||
}.${if enableUnfree then "unfree" else "free"};
|
||||
downloadToTemp = (!enableUnfree);
|
||||
stripRoot = false;
|
||||
# remove the unRAR related code from the src drv
|
||||
# > the license requires that you agree to these use restrictions,
|
||||
# > or you must remove the software (source and binary) from your hard disks
|
||||
# https://fedoraproject.org/wiki/Licensing:Unrar
|
||||
postFetch = lib.optionalString (!enableUnfree) ''
|
||||
mkdir tmp
|
||||
tar xf $downloadedFile -C ./tmp
|
||||
rm -r ./tmp/CPP/7zip/Compress/Rar*
|
||||
tar cfJ $out -C ./tmp . \
|
||||
--sort=name \
|
||||
--mtime="@$SOURCE_DATE_EPOCH" \
|
||||
--owner=0 --group=0 --numeric-owner \
|
||||
--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime
|
||||
'';
|
||||
rm -r $out/CPP/7zip/Compress/Rar*
|
||||
'';
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
patches = [
|
||||
./fix-cross-mingw-build.patch
|
||||
];
|
||||
|
Loading…
Reference in New Issue
Block a user