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

fribidi: update source #32725

Merged
merged 1 commit into from Dec 18, 2017
Merged

fribidi: update source #32725

merged 1 commit into from Dec 18, 2017

Conversation

lukateras
Copy link
Member

@lukateras lukateras commented Dec 15, 2017 •
edited

Motivation for this change

Fixes #32709.

/cc @Fuuzetsu

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.

@orivej
Copy link
Contributor

orivej commented Dec 15, 2017

Why did you add ? null to glib?

@lukateras
Copy link
Member Author

lukateras commented Dec 15, 2017 •
edited

It's an optional dependency.

By the way, previously fribidi was built without glib at all. It might make sense to disable it by default from closure size perspective.

@orivej
Copy link
Contributor

orivej commented Dec 15, 2017

It looks like fribidi uses glib only for tests, and the only reason it enters closure is due to lib/libfribidi.la file:

# Libraries that this one depends upon.
dependency_libs=' -L/nix/store/4bxgkmmn720w0jikk5sryd9w03wrgyb8-glib-2.54.2/lib -L/nix/store/8xvn6rvlz70n3hwqfr8l5sn1p9l6sqwr-pcre-8.41/lib /nix/store/4bxgkmmn720w0jikk5sryd9w03wrgyb8-glib-2.54.2/lib/libglib-2.0.la /nix/store/8xvn6rvlz70n3hwqfr8l5sn1p9l6sqwr-pcre-8.41/lib/libpcre.la -lpthread'

I'll remove the dependency and add a comment saying that it is not needed.

@lukateras
Copy link
Member Author

I see. Thanks!

@orivej orivej changed the base branch from master to staging December 16, 2017 00:10
jtojnar
jtojnar reviewed Dec 16, 2017
View reviewed changes
pkgs/development/libraries/fribidi/default.nix Outdated

outputs = [ "out" "devdoc" ];

meta = with stdenv.lib; {
homepage = http://fribidi.org/;
homepage = https://github.com/fribidi/fribidi/;
Copy link
Contributor

Choose a reason for hiding this comment

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

We could probably do without the trailing slash.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed!

@lukateras lukateras force-pushed the fribidi branch 3 times, most recently from 0232e15 to 51f47d6 Compare December 18, 2017 05:31
@lukateras @orivej
fribidi: update source
951c5d3 
The old site redirects to GitHub.
@orivej orivej changed the title fribidi: fix src, use autoreconfHook, optional glib dependency fribidi: update source Dec 18, 2017
@orivej orivej merged commit c4b7113 into NixOS:staging Dec 18, 2017
@lukateras lukateras mentioned this pull request Dec 19, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@lukateras @orivej @jtojnar @GrahamcOfBorg