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

opencl-clhpp: fix install directory #84924

Merged
merged 1 commit into from Apr 10, 2020
Merged

opencl-clhpp: fix install directory #84924

merged 1 commit into from Apr 10, 2020

Conversation

bhipple
Copy link
Contributor

@bhipple bhipple commented Apr 10, 2020 •
edited

Previously, it was installing to $out/include/include. Now it's correct:

/nix/store/alw8idc8qhfhzw98banq2l5hmrdaglgm-opencl-clhpp-2.0.11
├── include
│   └── CL
│       ├── cl2.hpp
│       └── cl.hpp
└── nix-support
    └── propagated-build-inputs

3 directories, 3 files
Motivation for this change
Things done
  • 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.

@bhipple
Copy link
Contributor Author

bhipple commented Apr 10, 2020

Result of nixpkgs-review pr 84924 1

1 package marked as broken and skipped:
- clfswm
3 packages failed to build:
- arrayfire
- ethminer
- forge
6 packages built:
- clfft
- ethash
- luxcorerender
- mandelbulber
- opencl-clhpp
- opencl-info

@bhipple
Copy link
Contributor Author

bhipple commented Apr 10, 2020

arrayfire, forge, and ethminer are all broken on master. On master, they fail instantly because this package's headers are in the wrong spot; in this PR, they fail much later on due to other issues.

@bhipple
opencl-clhpp: fix install directory
9c73b5f 
Previously, it was installing to `$out/include/include`. Now it's correct:

/nix/store/alw8idc8qhfhzw98banq2l5hmrdaglgm-opencl-clhpp-2.0.11
├── include
│   └── CL
│       ├── cl2.hpp
│       └── cl.hpp
└── nix-support
    └── propagated-build-inputs

3 directories, 3 files
@bhipple bhipple mentioned this pull request Apr 10, 2020
Merged
10 tasks
jonringer
jonringer approved these changes Apr 10, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

failures are broken on target branch

https://github.com/NixOS/nixpkgs/pull/84924
3 package failed to build:
arrayfire ethminer forge

6 package built:
clfft ethash luxcorerender mandelbulber opencl-clhpp opencl-info

@jonringer jonringer merged commit dd8d859 into NixOS:master Apr 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@bhipple @jonringer