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

brotli: fix darwin build #33341

Merged
merged 1 commit into from Jan 5, 2018
Merged

brotli: fix darwin build #33341

merged 1 commit into from Jan 5, 2018

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Jan 2, 2018 •
edited

Motivation for this change

Dependency of nix 1.12, the recent introduction of multiple outputs cased an output cycle.

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.

@LnL7 LnL7 added the 6.topic: darwin Running or building packages on Darwin label Jan 2, 2018
@dtzWill
Copy link
Member

dtzWill commented Jan 2, 2018

Looks good to me.

I'm curious, though-- do you know why these values aren't doing the right thing here? Are they being set correctly?

  • It includes /lib in CMAKE_INSTALL_NAME_DIR quite explicitly, which seems to be removed here
  • It defaults to $prefix/lib which seems.. strange? Should it be based on lib output instead?

@LnL7
Copy link
Member Author

LnL7 commented Jan 2, 2018

Yeah, just found the issue. I'll create another pr for that, but that will need to go through staging first.

@LnL7 LnL7 mentioned this pull request Jan 3, 2018
Merged
8 tasks
@ghost
Copy link

ghost commented Jan 5, 2018

Any movement on this? I'm attempting to add brotli support to apache httpd, but cannot compile brotli on macOS. Here is the abbreviated output from nix-build -A apacheHttpd using this tree

post-installation fixup
Moving /nix/store/8q2vpqkkwhgfrdxp0ivfq1cxxfp74hql-brotli-1.0.2-lib/lib/pkgconfig to /nix/store/g93ydl55azjp1anfram8kf0j2jj0k59g-brotli-1.0.2-dev/lib/pkgconfig
rmdir: failed to remove '/nix/store/8q2vpqkkwhgfrdxp0ivfq1cxxfp74hql-brotli-1.0.2-lib/lib': Directory not empty
Patching '/nix/store/g93ydl55azjp1anfram8kf0j2jj0k59g-brotli-1.0.2-dev/lib/pkgconfig/libbrotlicommon.pc' includedir to output /nix/store/g93ydl55azjp1anfram8kf0j2jj0k59g-brotli-1.0.2-dev
Patching '/nix/store/g93ydl55azjp1anfram8kf0j2jj0k59g-brotli-1.0.2-dev/lib/pkgconfig/libbrotlidec.pc' includedir to output /nix/store/g93ydl55azjp1anfram8kf0j2jj0k59g-brotli-1.0.2-dev
Patching '/nix/store/g93ydl55azjp1anfram8kf0j2jj0k59g-brotli-1.0.2-dev/lib/pkgconfig/libbrotlienc.pc' includedir to output /nix/store/g93ydl55azjp1anfram8kf0j2jj0k59g-brotli-1.0.2-dev
strip is /nix/store/bhfkh37smh9lc5bngdha6zx98k6w6cgd-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/57jxws8jqbl587msxdrji4c5xsw3d4vi-brotli-1.0.2/bin 
patching script interpreter paths in /nix/store/57jxws8jqbl587msxdrji4c5xsw3d4vi-brotli-1.0.2
strip is /nix/store/bhfkh37smh9lc5bngdha6zx98k6w6cgd-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/g93ydl55azjp1anfram8kf0j2jj0k59g-brotli-1.0.2-dev/lib 
patching script interpreter paths in /nix/store/g93ydl55azjp1anfram8kf0j2jj0k59g-brotli-1.0.2-dev
strip is /nix/store/bhfkh37smh9lc5bngdha6zx98k6w6cgd-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/8q2vpqkkwhgfrdxp0ivfq1cxxfp74hql-brotli-1.0.2-lib/lib 
patching script interpreter paths in /nix/store/8q2vpqkkwhgfrdxp0ivfq1cxxfp74hql-brotli-1.0.2-lib
cycle detected in the references of ‘/nix/store/57jxws8jqbl587msxdrji4c5xsw3d4vi-brotli-1.0.2’
cannot build derivation ‘/nix/store/245xgbn8fmddrrcrsn2x8iaqal7k14p2-apache-httpd-2.4.29.drv’: 1 dependencies couldn't be built
error: build of ‘/nix/store/245xgbn8fmddrrcrsn2x8iaqal7k14p2-apache-httpd-2.4.29.drv’ failed

@LnL7 LnL7 merged commit a7ef0c0 into NixOS:master Jan 5, 2018
@LnL7 LnL7 deleted the darwin-brotli branch January 5, 2018 18:48
@LnL7
Copy link
Member Author

LnL7 commented Jan 5, 2018

I will remove the workaround in the staging pr.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@LnL7 @dtzWill @GrahamcOfBorg