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

exiv2: re-enable split outputs

Browse Source 
Needs an extra patch to fix CMake config.

This reverts commit f8f840f664.
This commit is contained in:
Jan Tojnar 2020-09-10 21:19:16 +02:00
parent 20e90aac2e
commit 8060ecb97d
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,9 +17,7 @@ stdenv.mkDerivation rec {
pname = "exiv2"; pname = "exiv2";
version = "0.27.3"; version = "0.27.3";
# Disabled since splitting the outputs leads to issues, see outputs = [ "out" "dev" "doc" "man" ];
# https://github.com/NixOS/nixpkgs/pull/97161#issuecomment-689426419
# outputs = [ "out" "dev" "doc" "man" ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "exiv2"; owner = "exiv2";
@ -39,10 +37,14 @@ stdenv.mkDerivation rec {
# Use correct paths with multiple outputs # Use correct paths with multiple outputs
# https://github.com/Exiv2/exiv2/pull/1275 # https://github.com/Exiv2/exiv2/pull/1275
(fetchpatch { (fetchpatch {
name = "cmake-fix-aarch64.patch";
url = "https://github.com/Exiv2/exiv2/commit/48f2c9dbbacc0ef84c8ebf4cb1a603327f0b8750.patch"; url = "https://github.com/Exiv2/exiv2/commit/48f2c9dbbacc0ef84c8ebf4cb1a603327f0b8750.patch";
sha256 = "vjB3+Ld4c/2LT7nq6uatYwfHTh+HeU5QFPFXuNLpIPA="; 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 = [