colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #97161 from jtojnar/exiv2-cleanup

Browse Source 
exiv2: clean up
This commit is contained in:
WORLDofPEACE 2020-09-08 19:55:09 -04:00 committed by GitHub
commit 04fb0bb5e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/development/libraries/exiv2/default.nix
View File

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
pname = "exiv2"; pname = "exiv2";
version = "0.27.3"; version = "0.27.3";
outputs = [ "out" "dev" "doc" "man" ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "exiv2"; owner = "exiv2";
repo = "exiv2"; repo = "exiv2";
@ -31,21 +33,16 @@ stdenv.mkDerivation rec {
url = "https://github.com/Exiv2/exiv2/commit/bbe0b70840cf28b7dd8c0b7e9bb1b741aeda2efd.patch"; url = "https://github.com/Exiv2/exiv2/commit/bbe0b70840cf28b7dd8c0b7e9bb1b741aeda2efd.patch";
sha256 = "13zw1mn0ag0jrz73hqjhdsh1img7jvj5yddip2k2sb5phy04rzfx"; sha256 = "13zw1mn0ag0jrz73hqjhdsh1img7jvj5yddip2k2sb5phy04rzfx";
}) })
];
cmakeFlags = [ # Use correct paths with multiple outputs
"-DEXIV2_BUILD_PO=ON" # https://github.com/Exiv2/exiv2/pull/1275
"-DEXIV2_BUILD_DOC=ON" (fetchpatch {
# the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly name = "cmake-fix-aarch64.patch";
# (setting it to an absolute path causes include files to go to $out/$out/include, url = "https://github.com/Exiv2/exiv2/commit/48f2c9dbbacc0ef84c8ebf4cb1a603327f0b8750.patch";
# because the absolute path is interpreted with root at $out). sha256 = "vjB3+Ld4c/2LT7nq6uatYwfHTh+HeU5QFPFXuNLpIPA=";
# Can probably be removed once https://github.com/Exiv2/exiv2/pull/1263 is merged. })
"-DCMAKE_INSTALL_INCLUDEDIR=include"
"-DCMAKE_INSTALL_LIBDIR=lib"
]; ];
outputs = [ "out" "dev" "doc" "man" ];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
doxygen doxygen
@ -65,7 +62,13 @@ stdenv.mkDerivation rec {
which which
]; ];
cmakeFlags = [
"-DEXIV2_ENABLE_NLS=ON"
"-DEXIV2_BUILD_DOC=ON"
];
buildFlags = [ buildFlags = [
"all"
"doc" "doc"
]; ];
@ -102,20 +105,11 @@ stdenv.mkDerivation rec {
) )
''; '';
# Fix CMake export paths. Can be removed once https://github.com/Exiv2/exiv2/pull/1263 is merged.
postFixup = ''
sed -i "$dev/lib/cmake/exiv2/exiv2Config.cmake" \
-e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${_IMPORT_PREFIX}@$dev@" \
-e "/Compute the installation prefix/ a set(_IMPORT_PREFIX \"$out\")" \
-e "/^get_filename_component(_IMPORT_PREFIX/ d"
'';
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.exiv2.org/"; homepage = "https://www.exiv2.org/";
description = "A library and command-line utility to manage image metadata"; description = "A library and command-line utility to manage image metadata";
platforms = platforms.all; platforms = platforms.all;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ ];
}; };
} }