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

harfbuzz: add CoreText support for darwin #39502

Merged
merged 3 commits into from Aug 22, 2018
Merged

harfbuzz: add CoreText support for darwin #39502

merged 3 commits into from Aug 22, 2018

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Apr 25, 2018

Motivation for this change
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
Copy link

Success on x86_64-darwin (full log)

Attempted: harfbuzz

Partial log (click to expand)

/nix/store/819rrkr1ncdwl83b8r0s7kwivkll4i02-harfbuzz-1.7.6

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: harfbuzz

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/18hzsj3rsvz1m3q75yiisafwvx3z3ch1-harfbuzz-1.7.6-dev
shrinking /nix/store/18hzsj3rsvz1m3q75yiisafwvx3z3ch1-harfbuzz-1.7.6-dev/bin/hb-ot-shape-closure
shrinking /nix/store/18hzsj3rsvz1m3q75yiisafwvx3z3ch1-harfbuzz-1.7.6-dev/bin/hb-subset
shrinking /nix/store/18hzsj3rsvz1m3q75yiisafwvx3z3ch1-harfbuzz-1.7.6-dev/bin/hb-shape
shrinking /nix/store/18hzsj3rsvz1m3q75yiisafwvx3z3ch1-harfbuzz-1.7.6-dev/bin/hb-view
strip is /nix/store/j7d4mr0ikv974ig7yzhknpsq288js4bs-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/18hzsj3rsvz1m3q75yiisafwvx3z3ch1-harfbuzz-1.7.6-dev/lib  /nix/store/18hzsj3rsvz1m3q75yiisafwvx3z3ch1-harfbuzz-1.7.6-dev/bin
patching script interpreter paths in /nix/store/18hzsj3rsvz1m3q75yiisafwvx3z3ch1-harfbuzz-1.7.6-dev
checking for references to /build in /nix/store/18hzsj3rsvz1m3q75yiisafwvx3z3ch1-harfbuzz-1.7.6-dev...
/nix/store/161fcy6c8pn4ni1xlqz30qj8k95gvzqk-harfbuzz-1.7.6

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: harfbuzz

Partial log (click to expand)

/nix/store/lhz23pj0bds0fqp08hvvp1m7lnsr993m-harfbuzz-1.7.6

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: harfbuzz

Partial log (click to expand)

/nix/store/4v0l2y01pipd5v30f0v1mhnkh8iwrw2g-harfbuzz-1.7.6

@matthewbauer
Copy link
Member

matthewbauer commented Apr 25, 2018 •
edited

I dislike adding meta attribute names to all-packages.nix. Could we just have Harfbuzz default to use CoreText on Darwin (with a config option to disable it)? Users of Harfbuzz shouldn't have to know what it's been using on the backend IIRC. If it's really needed we need at least one package using each new attribute.

@LnL7
Copy link
Member Author

LnL7 commented Apr 25, 2018

I'll remove it for now, don't want to enable it by default since it depends on frameworks.

@matthewbauer
Copy link
Member

I wonder if we can get rid of harfbuzz-icu as well? It looks like we didn't want to enable it by default but a few packages might actually need it (IMO the override should go in the callPackage of where it's needed).

@LnL7
Copy link
Member Author

LnL7 commented Apr 25, 2018 •
edited

What about harfbuzz and harfbuzzFull, that's pretty common for packages with feature flags. It avoids extra dependencies by default while still making it available. (eg. nix-index will be able to find the hb-coretext.h header)

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: harfbuzz

Partial log (click to expand)

/nix/store/4v0l2y01pipd5v30f0v1mhnkh8iwrw2g-harfbuzz-1.7.6

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: harfbuzz

Partial log (click to expand)

/nix/store/lhz23pj0bds0fqp08hvvp1m7lnsr993m-harfbuzz-1.7.6

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: harfbuzz

Partial log (click to expand)

/nix/store/9cspif3di102ih29c59q6j7bgbg9lhw9-harfbuzz-1.7.6

matthewbauer
matthewbauer reviewed May 1, 2018
View reviewed changes
pkgs/development/libraries/harfbuzz/default.nix
@@ -1,5 +1,7 @@
{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintl
, icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one.
, ApplicationServices, CoreText
, withCoreText ? false
Copy link
Member

Choose a reason for hiding this comment

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

Also see `withApple' in #39580.

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: harfbuzz

Partial log (click to expand)

/nix/store/cj4hi7kn1gz5c0j4r13770yfmrq1ddwa-harfbuzz-1.7.6

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: harfbuzz

Partial log (click to expand)

these paths will be fetched (0.33 MiB download, 1.02 MiB unpacked):
  /nix/store/44nryi736wilz4j2gqxysdgpidsgs920-graphite2-1.3.6
  /nix/store/pzh8q87czxmpk6gipbalksqqickfc174-harfbuzz-1.7.6
copying path '/nix/store/44nryi736wilz4j2gqxysdgpidsgs920-graphite2-1.3.6' from 'https://cache.nixos.org'...
copying path '/nix/store/pzh8q87czxmpk6gipbalksqqickfc174-harfbuzz-1.7.6' from 'https://cache.nixos.org'...
/nix/store/pzh8q87czxmpk6gipbalksqqickfc174-harfbuzz-1.7.6

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: harfbuzz

Partial log (click to expand)

/nix/store/z2n0m84h03mw56vvc3iv83qhvqvk2hrb-harfbuzz-1.7.6

@xeji
Copy link
Contributor

xeji commented Jun 2, 2018

This looks ready but there's a merge conflict now.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: harfbuzz

Partial log (click to expand)

/nix/store/dxx9633g3gf9z3f8mprkvhyj75xlbksn-harfbuzz-1.8.8

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: harfbuzz

Partial log (click to expand)

/nix/store/bfnx0116pi9h62sbjs3b8iv6g1lsbqkl-harfbuzz-1.8.8

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: harfbuzz

Partial log (click to expand)

/nix/store/q5m8a12nn78qgbdbx7qfyfc4rhwgvy25-harfbuzz-1.8.8

@LnL7 LnL7 merged commit 6a335f9 into NixOS:master Aug 22, 2018
@LnL7 LnL7 deleted the darwin-harfbuzz branch August 22, 2018 19:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer left review comments

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 101-500 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@LnL7 @GrahamcOfBorg @matthewbauer @xeji