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.

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

enlightenment fixes and updates #28477

Merged
merged 5 commits into from Aug 26, 2017
Merged

enlightenment fixes and updates #28477

merged 5 commits into from Aug 26, 2017

Conversation

romildo
Copy link
Contributor

@romildo romildo commented Aug 22, 2017

Motivation for this change
  • efl: propagate utillinux, fribidi and SDL2, which are runtime dependencies

  • ephoto: 1.0 -> 1.5

  • efl: remove old version 1.19.1

  • terminology: 1.0.0 -> 1.1.0

  • efl applications: use vanilla pkg-config

    Use vanilla pkg-config to build EFL applications.

    The EFL library has a set of pkg-config files (*.pc) which uses private requirements. The default pkg-config setup on nixpkgs is patched to disable resolving those requirements. See http://bugs.freedesktop.org/show_bug.cgi?id=4738 for reference.

    As a consequence each package depending on efl has to explicitly set the search path in order to be able to find the corresponding header files.

    By using vanilla pkg-config this is not necessary (and this is the expected behaviour for pkg-config), allowing simpler nix expressions.

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
    • Linux
  • 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.

- Update to version 1.5, which builds of the latest efl versions
- Version 1.19.1 is not needed anymore to build ephoto.
Use vanilla pkg-config to build EFL applications.

The EFL library has a set of pkg-config files (*.pc) which uses
private requirements. The default pkg-config setup on nixpkgs is
patched to disable resolving those requirements. See
http://bugs.freedesktop.org/show_bug.cgi?id=4738 for reference.

As a consequence each package depending on efl has to explicitly set
the search path in order to be able to find the corresponding header
files.

By using vanilla pkg-config this is not necessary (and this is the
expected behaviour for pkg-config), allowing simpler nix expressions.
@joachifm joachifm merged commit 3c4ffdc into NixOS:master Aug 26, 2017
@romildo romildo deleted the fix.efl branch August 26, 2017 22:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants