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

luxcorerender: 2.0 -> 2.4 #101413

Merged
merged 1 commit into from Feb 6, 2021
Merged

luxcorerender: 2.0 -> 2.4 #101413

merged 1 commit into from Feb 6, 2021

Conversation

@jmpunkt
Copy link
Contributor

@jmpunkt jmpunkt commented Oct 22, 2020

Motivation for this change

Fix the build of the package which currently fails on master and 20.09. Bumped to a new version since this version does not require OpenCL nor Cuda to be present during compile time. Both are detected dynamically during runtime. However, the executables must be compiled such that OpenCL and Cuda are potentially supported. If OpenCL or Cuda is not present during runtime, the CPU is used as a fallback.

Notice: I was not able to verify that OpenCL or Cuda works. I do not have a working configuration for OpenCL and do not own a Nvidia card. The software runs fine even if OpenCL and Cuda are not detected.

Tested the UI executable of LuxCore with

result/bin/luxcoreui $LUXCORE_SRC/scenes/psor-cube/psor-cube.cfg
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.
@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Nov 27, 2020

Result of nixpkgs-review pr 101413 run on x86_64-linux 1

1 package built:
  • luxcorerender

Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Can you squash the commits together? Otherwise I think this is fine.

@dotlambda
Copy link
Member

@dotlambda dotlambda commented Feb 6, 2021

@jmpunkt Can you resolve the merge conflict?

@jmpunkt
Copy link
Contributor Author

@jmpunkt jmpunkt commented Feb 6, 2021

Total of three different external changes were made since this PR was created.

Took care of

  • treewide: pkg-conf
  • treewide: stdenv.lib
  • treewide: cmake buildInputs to nativeBuildInputs

@dotlambda dotlambda merged commit c7fef40 into NixOS:master Feb 6, 2021
20 checks passed
@dotlambda
Copy link
Member

@dotlambda dotlambda commented Feb 6, 2021

Thanks a lot @jmpunkt!

LeUlukai added a commit to LeUlukai/nixpkgs that referenced this issue Feb 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants