Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

exiv2: clean up #97161

Merged
merged 1 commit into from Sep 8, 2020
Merged

exiv2: clean up #97161

merged 1 commit into from Sep 8, 2020

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Sep 4, 2020

Motivation for this change
  • EXIV2_BUILD_PO has been replaced by EXIV2_ENABLE_NLS
    Exiv2/exiv2@076585d
    Confusingly, the former still appears in the flag summary.
  • Remove enableParallelBuilding since it is on by default with CMake
  • Reorder the expression
  • Apply upstream GNUInstallDirs patch (cmake: Fix paths with absolute GNUInstallDirs Exiv2/exiv2#1275)
  • Build stuff in build phase, not in install phase
  • Add maintainers field (empty at the moment)

cc @paperdigits

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jtojnar
exiv2: clean up
3dc2c52 
- EXIV2_BUILD_PO has been replaced by EXIV2_ENABLE_NLS
  Exiv2/exiv2@076585d
  Confusingly, the former still appears in the flag summary.
- Remove enableParallelBuilding since it is on by default with CMake
- Reorder the expression
- Apply upstream GNUInstallDirs patch
- Build stuff in build phase, not in install phase
- Add maintainers field (empty at the moment)
@worldofpeace worldofpeace merged commit 04fb0bb into NixOS:master Sep 8, 2020
@worldofpeace worldofpeace deleted the exiv2-cleanup branch September 8, 2020 23:55
@timokau
Copy link
Member

timokau commented Sep 9, 2020

It looks like this didn't quite work as intended, it broke the digikam build:

--  ==> Graphviz Dot is found:     NO
-- Configuring done
CMake Error in core/app/CMakeLists.txt:
  Imported target "exiv2lib" includes non-existent path

    "/nix/store/qx8azn7x87g6w56j14cvhykfxqwv1vmf-exiv2-0.27.3/include"

  in its INTERFACE_INCLUDE_DIRECTORIES.  Possible reasons include:

  * The path was deleted, renamed, or moved to another location.

  * An install or uninstall procedure did not complete successfully.

  * The installation package was faulty and references files it does not
  provide.

Apparently exiv still pretends that its include directory is in the out output. I don't know much about cmake, but it looks like this is specified in exiv2.dev/lib/cmake/exiv2/exiv2Config.cmake. Any idea why this is happening?

@timokau timokau mentioned this pull request Sep 9, 2020
Merged
10 tasks
This was referenced Sep 10, 2020
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jtojnar @timokau @worldofpeace