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

cgal: add patch so include files can be found by dependent packages #94875

Merged
merged 1 commit into from Aug 10, 2020
Merged

cgal: add patch so include files can be found by dependent packages #94875

merged 1 commit into from Aug 10, 2020

Conversation

matthuszagh
Copy link
Contributor

Motivation for this change

See this issue.

Things done

Add patch so include files can be found by dependent packages.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@matthuszagh matthuszagh mentioned this pull request Aug 7, 2020
Closed
@ofborg ofborg bot requested a review from 7c6f434c August 7, 2020 16:46
@haslersn
Copy link
Contributor

haslersn commented Aug 8, 2020

Why does your commit give me cgal-4.14.2?

nix-repl> ((import (fetchTarball https://github.com/matthuszagh/nixpkgs/archive/dd25bb756a305df1b0476ad192446135cbc3fe61.tar.gz) {}).cgal)               
«derivation /nix/store/536gxaa45zqkkahfzh0lkm8n19k4yr7l-cgal-4.14.2.drv»

@matthuszagh
Copy link
Contributor Author

@haslersn because cgal in all-packages references cgal_4. Presuming you want cgal_5 you have to type that specifically.

@haslersn
Copy link
Contributor

haslersn commented Aug 8, 2020

I approve, but I'm not allowed to merge.

@7c6f434c 7c6f434c merged commit f70c186 into NixOS:master Aug 10, 2020
@matthuszagh matthuszagh deleted the cgal branch August 10, 2020 16:00
@haslersn
Copy link
Contributor

According to CGAL/cgal#4915 (comment) we should simply set CMAKE_INSTALL_PREFIX to the empty string.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@matthuszagh @haslersn @7c6f434c