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

opencsg: Darwin support and tidy #61088

Merged
merged 1 commit into from May 8, 2019

Conversation

@thefloweringash
Copy link
Member

commented May 7, 2019

Regenerate the Makefiles using qmake to set the correct compiler and
use the default installPhase.

Motivation for this change

Working towards building openscad for Darwin.

The install name handling here is rather unpleasant. The library is ultimately corrected in the fixup phase by the hook, however the example application is already linked by then. Suggestions for improvement welcome.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

opencsg: Darwin support and tidy
Regenerate the Makefiles using qmake to set the correct compiler and
use the default installPhase.

@ofborg ofborg bot added the 6.topic: darwin label May 7, 2019

@thefloweringash

This comment has been minimized.

Copy link
Member Author

commented May 7, 2019

Patch sent upstream as floriankirsch/OpenCSG#2

@7c6f434c

This comment has been minimized.

Copy link
Member

commented May 7, 2019

@GrahamcOfBorg build openscad

@thefloweringash

This comment has been minimized.

Copy link
Member Author

commented May 7, 2019

@7c6f434c this only fixes opencsg. openscad needs a little more work.

@7c6f434c

This comment has been minimized.

Copy link
Member

commented May 8, 2019

I just wanted to check that rerunning qmake doesn't have any side-effects that OpenSCAD would care about.

@7c6f434c 7c6f434c merged commit 71f9786 into NixOS:master May 8, 2019

15 of 16 checks passed

openscad on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
openscad on aarch64-linux Success
Details
openscad on x86_64-linux Success
Details

@thefloweringash thefloweringash deleted the thefloweringash:opencsg-darwin branch May 8, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.