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

geeqie: 1.3 -> 1.4 #35462

Merged
merged 1 commit into from Feb 24, 2018
Merged

geeqie: 1.3 -> 1.4 #35462

merged 1 commit into from Feb 24, 2018

Conversation

jfrankenau
Copy link
Member

Motivation for this change

Update and build with default features.

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
    • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

cc @pSub

@@ -45,7 +48,7 @@ stdenv.mkDerivation rec {

homepage = http://geeqie.sourceforge.net;
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you change this to http://geeqie.org?

Copy link
Member Author

Choose a reason for hiding this comment

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

Will do that in 1.4.1. Thank you for your review!

};

preConfigure = "./autogen.sh";
# Do not build the changelog as this requires markdown.
Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like it i more of because a missing file: BestImageViewer/geeqie#568 If markdown is missing, README.html generation is just skipped.

Copy link
Member Author

Choose a reason for hiding this comment

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

You are right. My comment there is wrong. I will remove it when 1.4.1 is released.


configureFlags = [ "--enable-gps" ];
preConfigure = "./autogen.sh";
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you are supposed to add NOCONFIGURE=1 before ./autogen.sh. That way configuration will actually be done during configurePhase.

Copy link
Member Author

Choose a reason for hiding this comment

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

Looks like it. The --enable-gps flag however was renamed and enabled by default anyway which is why I removed it. It would be probably best to still add NOCONFIGURE in case someone would want to enable or disable a feature in the future.

Copy link
Contributor

Choose a reason for hiding this comment

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

NOCONFIGURE just prevents, running ./configure from ./autogen.sh, which is not needed since it will be called in configurePhase.

@jtojnar
Copy link
Contributor

jtojnar commented Feb 24, 2018

Hmm, I am two hours late with my review 🕴️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants