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

dcraw: fix build on Darwin #44912

Merged
merged 1 commit into from Aug 13, 2018
Merged

dcraw: fix build on Darwin #44912

merged 1 commit into from Aug 13, 2018

Conversation

thefloweringash
Copy link
Member

@thefloweringash thefloweringash commented Aug 11, 2018 •
edited

Motivation for this change

Noticed it was broken.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

LnL7
LnL7 reviewed Aug 12, 2018
View reviewed changes
pkgs/tools/graphics/dcraw/default.nix Outdated
@@ -8,15 +8,18 @@ stdenv.mkDerivation rec {
sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418";
};

buildInputs = [ libjpeg lcms2 gettext jasper ];
buildInputs = [ libjpeg lcms2 gettext jasper ]
++ stdenv.lib.optional stdenv.isDarwin libiconv;
Copy link
Member

Choose a reason for hiding this comment

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

I think this doesn't need to be conditional anymore.

@LnL7
Copy link
Member

LnL7 commented Aug 12, 2018

@GrahamcOfBorg build dcraw

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: dcraw

Partial log (click to expand)

make: Nothing to be done for 'install'.
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/zzxlpkn98yd1sp9m9mizdc67gkcsk6x1-dcraw-9.28.0
shrinking /nix/store/zzxlpkn98yd1sp9m9mizdc67gkcsk6x1-dcraw-9.28.0/bin/dcraw
gzipping man pages under /nix/store/zzxlpkn98yd1sp9m9mizdc67gkcsk6x1-dcraw-9.28.0/share/man/
strip is /nix/store/ah0va6j4cnwj9nx4j6rwcfc8nh785jwm-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/zzxlpkn98yd1sp9m9mizdc67gkcsk6x1-dcraw-9.28.0/bin
patching script interpreter paths in /nix/store/zzxlpkn98yd1sp9m9mizdc67gkcsk6x1-dcraw-9.28.0
checking for references to /build in /nix/store/zzxlpkn98yd1sp9m9mizdc67gkcsk6x1-dcraw-9.28.0...
/nix/store/zzxlpkn98yd1sp9m9mizdc67gkcsk6x1-dcraw-9.28.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: dcraw

Partial log (click to expand)

make: Nothing to be done for 'install'.
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/c9vkfs41w69df6qkppk9wjfb5562678r-dcraw-9.28.0
shrinking /nix/store/c9vkfs41w69df6qkppk9wjfb5562678r-dcraw-9.28.0/bin/dcraw
gzipping man pages under /nix/store/c9vkfs41w69df6qkppk9wjfb5562678r-dcraw-9.28.0/share/man/
strip is /nix/store/gpc2wld1s0c6qzx9326cwn1wcx29xzsj-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/c9vkfs41w69df6qkppk9wjfb5562678r-dcraw-9.28.0/bin
patching script interpreter paths in /nix/store/c9vkfs41w69df6qkppk9wjfb5562678r-dcraw-9.28.0
checking for references to /build in /nix/store/c9vkfs41w69df6qkppk9wjfb5562678r-dcraw-9.28.0...
/nix/store/c9vkfs41w69df6qkppk9wjfb5562678r-dcraw-9.28.0

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: dcraw

Partial log (click to expand)

ld: warning: option -s is obsolete and being ignored
installing
install flags: install
make: Nothing to be done for 'install'.
post-installation fixup
gzipping man pages under /nix/store/m04hllh7rh6hvmxisj9fv2zj3jyzmcx1-dcraw-9.28.0/share/man/
strip is /nix/store/251fvx4mx9q4zarbca5cciasmn66p668-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/m04hllh7rh6hvmxisj9fv2zj3jyzmcx1-dcraw-9.28.0/bin
patching script interpreter paths in /nix/store/m04hllh7rh6hvmxisj9fv2zj3jyzmcx1-dcraw-9.28.0
/nix/store/m04hllh7rh6hvmxisj9fv2zj3jyzmcx1-dcraw-9.28.0

@thefloweringash
Copy link
Member Author

iconv in this case is used only for character conversions at build time, which means I should make it a nativeBuildInput. In this case, is it conditional, since only darwin provides the iconv executable via a separate package?

@LnL7 LnL7 merged commit e55eec5 into NixOS:master Aug 13, 2018
@thefloweringash thefloweringash deleted the dcraw-darwin branch August 19, 2018 03:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 LnL7 approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@thefloweringash @LnL7 @GrahamcOfBorg