cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #127172 from paperdigits/exiv2-update

Browse source 
exiv2: 0.27.3 -> 0.27.4
This commit is contained in:
Sandro 2021-06-18 12:07:31 +02:00 committed by GitHub
commit f6f0b937b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/development/libraries/exiv2/default.nix
View file

@ -1,6 +1,5 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, zlib , zlib
, expat , expat
, cmake , cmake
@ -15,7 +14,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "exiv2"; pname = "exiv2";
version = "0.27.3"; version = "0.27.4";
outputs = [ "out" "dev" "doc" "man" ]; outputs = [ "out" "dev" "doc" "man" ];
@ -23,30 +22,9 @@ stdenv.mkDerivation rec {
owner = "exiv2"; owner = "exiv2";
repo = "exiv2"; repo = "exiv2";
rev = "v${version}"; rev = "v${version}";
sha256 = "0d294yhcdw8ziybyd4rp5hzwknzik2sm0cz60ff7fljacv75bjpy"; sha256 = "0m1x79q6i5fw3gr9k0dw0bbl7ym27g9vbmxiamks6yw028xqwc5a";
}; };
patches = [
# Fix aarch64 build https://github.com/Exiv2/exiv2/pull/1271
(fetchpatch {
name = "cmake-fix-aarch64.patch";
url = "https://github.com/Exiv2/exiv2/commit/bbe0b70840cf28b7dd8c0b7e9bb1b741aeda2efd.patch";
sha256 = "13zw1mn0ag0jrz73hqjhdsh1img7jvj5yddip2k2sb5phy04rzfx";
})
# Use correct paths with multiple outputs
# https://github.com/Exiv2/exiv2/pull/1275
(fetchpatch {
url = "https://github.com/Exiv2/exiv2/commit/48f2c9dbbacc0ef84c8ebf4cb1a603327f0b8750.patch";
sha256 = "vjB3+Ld4c/2LT7nq6uatYwfHTh+HeU5QFPFXuNLpIPA=";
})
# https://github.com/Exiv2/exiv2/pull/1294
(fetchpatch {
url = "https://github.com/Exiv2/exiv2/commit/306c8a6fd4ddd70e76043ab255734720829a57e8.patch";
sha256 = "0D/omxYxBPGUu3uSErlf48dc6Ukwc2cEN9/J3e7a9eU=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
doxygen doxygen