BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #119624 from LeSuisse/jhead-3.06.0.1

Browse source 
jhead: 3.04 -> 3.06.0.1
This commit is contained in:
Sandro 2021-04-17 17:30:59 +02:00 committed by GitHub
commit 7bf5d700c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkgs/tools/graphics/jhead/default.nix
View file

@ -1,31 +1,20 @@
{ lib, stdenv, fetchurl, fetchpatch, libjpeg }: { lib, stdenv, fetchFromGitHub, libjpeg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jhead"; pname = "jhead";
version = "3.04"; version = "3.06.0.1";
src = fetchurl { src = fetchFromGitHub {
url = "http://www.sentex.net/~mwandel/jhead/${pname}-${version}.tar.gz"; owner = "Matthias-Wandel";
sha256 = "1j831bqw1qpkbchdriwcy3sgzvbagaj45wlc124fs9bc9z7vp2gg"; repo = "jhead";
rev = version;
sha256 = "0zgh36486cpcnf7xg6dwf7rhz2h4gpayqvdk8hmrx6y418b2pfyf";
}; };
patches = [
(fetchpatch {
url = "https://sources.debian.org/data/main/j/jhead/1:3.04-2/debian/patches/01_gpsinfo.c";
sha256 = "0r8hdbfrdxip4dwz5wqsv47a29j33cx7w5zx4jdhp5l1ihg003lz";
})
];
buildInputs = [ libjpeg ]; buildInputs = [ libjpeg ];
makeFlags = [ "CPPFLAGS=" "CFLAGS=-O3" "LDFLAGS=" ]; makeFlags = [ "CPPFLAGS=" "CFLAGS=-O3" "LDFLAGS=" ];
patchPhase = ''
sed -i '/dpkg-buildflags/d' makefile
substituteInPlace jhead.c \
--replace "jpegtran -trim" "${libjpeg.bin}/bin/jpegtran -trim"
'';
installPhase = '' installPhase = ''
mkdir -p \ mkdir -p \
$out/bin \ $out/bin \
@ -43,10 +32,5 @@ stdenv.mkDerivation rec {
license = licenses.publicDomain; license = licenses.publicDomain;
maintainers = with maintainers; [ rycee ]; maintainers = with maintainers; [ rycee ];
platforms = platforms.all; platforms = platforms.all;
# https://github.com/NixOS/nixpkgs/issues/90828
knownVulnerabilities = [
"CVE-2020-6624"
"CVE-2020-6625"
];
}; };
} }