Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a372d0f15f4c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e0112b7ef58
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 10, 2020

  1. exiv2: re-enable split outputs 

    Needs an extra patch to fix CMake config.

This reverts commit f8f840f.
    @jtojnar
    jtojnar committed Sep 10, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    shlevy Shea Levy
    GPG key ID: 5C0BD6957D86FE27
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8060ecb View commit details

Commits on Sep 11, 2020

  1. Merge pull request #97705 from jtojnar/exiv2-split-again 

    exiv2: re-enable split outputs
    @timokau
    timokau authored Sep 11, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    shlevy Shea Levy
    GPG key ID: 5C0BD6957D86FE27
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5e0112b View commit details
Showing with 6 additions and 4 deletions.
  1. +6 −4 pkgs/development/libraries/exiv2/default.nix
10 changes: 6 additions & 4 deletions pkgs/development/libraries/exiv2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,9 +17,7 @@ stdenv.mkDerivation rec {
pname = "exiv2";
version = "0.27.3";

# Disabled since splitting the outputs leads to issues, see
# https://github.com/NixOS/nixpkgs/pull/97161#issuecomment-689426419
# outputs = [ "out" "dev" "doc" "man" ];
outputs = [ "out" "dev" "doc" "man" ];

src = fetchFromGitHub {
owner = "exiv2";
@@ -39,10 +37,14 @@ stdenv.mkDerivation rec {
# Use correct paths with multiple outputs
# https://github.com/Exiv2/exiv2/pull/1275
(fetchpatch {
name = "cmake-fix-aarch64.patch";
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 = [