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

epoxy: fix darwin build #37315

Merged
merged 1 commit into from Mar 18, 2018
Merged

epoxy: fix darwin build #37315

merged 1 commit into from Mar 18, 2018

Conversation

xeji
Copy link
Contributor

@xeji xeji commented Mar 18, 2018

Motivation for this change

Fix build on darwin that was broken by #35369.

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.

@GrahamcOfBorg GrahamcOfBorg added the 6.topic: darwin Running or building packages on Darwin label Mar 18, 2018
@Mic92
Copy link
Member

Mic92 commented Mar 18, 2018

Do we need a backport for this?

@xeji
Copy link
Contributor Author

xeji commented Mar 18, 2018

No, this isn't in 18.03.

@Mic92
Copy link
Member

Mic92 commented Mar 18, 2018

@GrahamcOfBorg build epoxy

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: epoxy

Partial log (click to expand)

/nix/store/6yfslf2mdx8n4h9idhh4nflrzj0grxrq-epoxy-1.5.0

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: epoxy

Partial log (click to expand)

post-installation fixup
Patching '/nix/store/rl2svfg1946nrgjsrdp4547pm3cxix04-epoxy-1.5.0-dev/lib/pkgconfig/epoxy.pc' includedir to output /nix/store/rl2svfg1946nrgjsrdp4547pm3cxix04-epoxy-1.5.0-dev
strip is /nix/store/vb6mgjqgd9h11nbv60fvrp1ls9nxck2y-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/2j3c9y581yrvz5ym10rg1d5x0gzrvhs6-epoxy-1.5.0/lib
patching script interpreter paths in /nix/store/2j3c9y581yrvz5ym10rg1d5x0gzrvhs6-epoxy-1.5.0
/nix/store/2j3c9y581yrvz5ym10rg1d5x0gzrvhs6-epoxy-1.5.0/lib/libepoxy.0.dylib: fixing dylib
strip is /nix/store/vb6mgjqgd9h11nbv60fvrp1ls9nxck2y-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/rl2svfg1946nrgjsrdp4547pm3cxix04-epoxy-1.5.0-dev/lib
patching script interpreter paths in /nix/store/rl2svfg1946nrgjsrdp4547pm3cxix04-epoxy-1.5.0-dev
/nix/store/2j3c9y581yrvz5ym10rg1d5x0gzrvhs6-epoxy-1.5.0

@Mic92 Mic92 merged commit aa878c2 into NixOS:master Mar 18, 2018
@xeji xeji deleted the epoxy-darwin-fix branch March 18, 2018 12:54
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: epoxy

Partial log (click to expand)

/nix/store/6yfslf2mdx8n4h9idhh4nflrzj0grxrq-epoxy-1.5.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: epoxy

Partial log (click to expand)

/nix/store/bji4kya2y15b7rzjg4mkvwgz33h1y997-epoxy-1.5.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: epoxy

Partial log (click to expand)

/nix/store/bji4kya2y15b7rzjg4mkvwgz33h1y997-epoxy-1.5.0

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: 101-500 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@xeji @Mic92 @GrahamcOfBorg