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.

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

digikam: Add patch to fix compilation against Lensfun 0.3.2 #21366

Merged
merged 1 commit into from Feb 14, 2017

Conversation

sh01
Copy link
Contributor

@sh01 sh01 commented Dec 22, 2016

Motivation for this change

Digikam4 compilation was broken by updating Lensfun to 0.3.2. This adds a patch from upstream to fix it.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@sh01, thanks for your PR! By analyzing the history of the files in this pull request, we identified @cillianderoiste, @jraygauthier and @ttuegel to be potential reviewers.

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, automoc4, boost, shared_desktop_ontologies, cmake
{ stdenv, fetchurl, pkgs, automoc4, boost, shared_desktop_ontologies, cmake
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should depend on fetchpatch instead of the whole pkg.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems fine to me otherwise.

@sh01 sh01 force-pushed the digikam_patch_lensfun_0.3.2 branch from 47d26fe to 4efd108 Compare December 23, 2016 04:29
@sh01
Copy link
Contributor Author

sh01 commented Dec 23, 2016

I've rewritten this to not import all of pkgs and instead take fetchpatch directly. PTAL.

@sh01
Copy link
Contributor Author

sh01 commented Dec 23, 2016

The Travis failure is a build time limit overrun. I don't think it indicates a real issue.

@jraygauthier
Copy link
Member

This seems fine to me now.

@ttuegel ttuegel merged commit c5c4380 into NixOS:master Feb 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants