aland/nixpkgs-odroid-hc4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

Browse source 
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 • committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

31
pkgs/applications/misc/jigdo/default.nix Normal file
View file

@ -0,0 +1,31 @@
{ lib, stdenv, fetchurl, db, gtk2, bzip2 }:
stdenv.mkDerivation rec {
pname = "jigdo";
version = "0.7.3";
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_${version}.orig.tar.gz";
sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv";
};
patches = [
(fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-4.diff.gz";
sha256 = "03zsh57fijciiv23lf55k6fbfhhzm866xjhx83x54v5s1g2h6m8y";
})
./sizewidth.patch
];
buildInputs = [ db gtk2 bzip2 ];
configureFlags = [ "--without-libdb" ];
meta = with lib; {
description = "Download utility that can fetch files from several sources simultaneously";
homepage = "http://atterer.org/jigdo/";
license = licenses.gpl2Only;
platforms = platforms.unix;
maintainers = with maintainers; [ ];
};
}

40
pkgs/applications/misc/jigdo/sizewidth.patch Normal file
View file

@ -0,0 +1,40 @@
diff --git i/src/mkimage.cc w/src/mkimage.cc
index 02e65b1..b263796 100755
--- i/src/mkimage.cc
+++ w/src/mkimage.cc
@@ -285,27 +285,27 @@ bostream& JigdoDescVec::put(bostream& file, MD5Sum* md) const {
//______________________________________________________________________
namespace {
- const int SIZE_WIDTH = 12;
+ const int MKIMAGE_SIZE_WIDTH = 12;
}
ostream& JigdoDesc::ImageInfo::put(ostream& s) const {
- s << "image-info " << setw(SIZE_WIDTH) << size() << " "
+ s << "image-info " << setw(MKIMAGE_SIZE_WIDTH) << size() << " "
<< md5() << ' ' << blockLength() << '\n';
return s;
}
ostream& JigdoDesc::UnmatchedData::put(ostream& s) const {
- s << "in-template " << setw(SIZE_WIDTH) << offset() << ' '
- << setw(SIZE_WIDTH) << size() << '\n';
+ s << "in-template " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' '
+ << setw(MKIMAGE_SIZE_WIDTH) << size() << '\n';
return s;
}
ostream& JigdoDesc::MatchedFile::put(ostream& s) const {
- s << "need-file " << setw(SIZE_WIDTH) << offset() << ' '
- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
+ s << "need-file " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' '
+ << setw(MKIMAGE_SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
return s;
}
ostream& JigdoDesc::WrittenFile::put(ostream& s) const {
- s << "have-file " << setw(SIZE_WIDTH) << offset() << ' '
- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
+ s << "have-file " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' '
+ << setw(MKIMAGE_SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
return s;
}