|
|
|
@ -1,31 +1,20 @@ |
|
|
|
|
{ lib, stdenv, fetchurl, fetchpatch, libjpeg }: |
|
|
|
|
{ lib, stdenv, fetchFromGitHub, libjpeg }: |
|
|
|
|
|
|
|
|
|
stdenv.mkDerivation rec { |
|
|
|
|
pname = "jhead"; |
|
|
|
|
version = "3.04"; |
|
|
|
|
version = "3.06.0.1"; |
|
|
|
|
|
|
|
|
|
src = fetchurl { |
|
|
|
|
url = "http://www.sentex.net/~mwandel/jhead/${pname}-${version}.tar.gz"; |
|
|
|
|
sha256 = "1j831bqw1qpkbchdriwcy3sgzvbagaj45wlc124fs9bc9z7vp2gg"; |
|
|
|
|
src = fetchFromGitHub { |
|
|
|
|
owner = "Matthias-Wandel"; |
|
|
|
|
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 ]; |
|
|
|
|
|
|
|
|
|
makeFlags = [ "CPPFLAGS=" "CFLAGS=-O3" "LDFLAGS=" ]; |
|
|
|
|
|
|
|
|
|
patchPhase = '' |
|
|
|
|
sed -i '/dpkg-buildflags/d' makefile |
|
|
|
|
substituteInPlace jhead.c \ |
|
|
|
|
--replace "jpegtran -trim" "${libjpeg.bin}/bin/jpegtran -trim" |
|
|
|
|
''; |
|
|
|
|
|
|
|
|
|
installPhase = '' |
|
|
|
|
mkdir -p \ |
|
|
|
|
$out/bin \ |
|
|
|
@ -43,10 +32,5 @@ stdenv.mkDerivation rec { |
|
|
|
|
license = licenses.publicDomain; |
|
|
|
|
maintainers = with maintainers; [ rycee ]; |
|
|
|
|
platforms = platforms.all; |
|
|
|
|
# https://github.com/NixOS/nixpkgs/issues/90828 |
|
|
|
|
knownVulnerabilities = [ |
|
|
|
|
"CVE-2020-6624" |
|
|
|
|
"CVE-2020-6625" |
|
|
|
|
]; |
|
|
|
|
}; |
|
|
|
|
} |
|
|
|
|