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

gwyddion: support darwin #83914

Merged
merged 2 commits into from Apr 2, 2020
Merged

gwyddion: support darwin #83914

merged 2 commits into from Apr 2, 2020

Conversation

cgevans
Copy link
Contributor

@cgevans cgevans commented Apr 1, 2020 •
edited

Motivation for this change

Gwyddion will build on Darwin, but gnome2.gtkglext is broken there,
and so I am disabling it as an optional dependency here when building
on Darwin.

Things done

Note that I personally have only tested that this will continue to build and work on NixOS. Someone else tested that the previous Gwyddion derivation builds, all binaries work, and the Python 2.7 module loads, so long as gnome2.gtkglext is not used (it fails to build on OS X); that is what this change is meant to ensure.

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

@veprbl
Copy link
Member

veprbl commented Apr 1, 2020

@GrahamcOfBorg eval
@GrahamcOfBorg build gwyddion

@cgevans
Copy link
Contributor Author

cgevans commented Apr 1, 2020

It looks like the libunique derivation does not have darwin set as supported, though it will build if allowUnsupportedSystem is set, and that's causing the ofborg build to fail.

@cgevans
gwyddion: add darwin support
cacbbe9 
Gwyddion will build on Darwin, but gnome2.gtkglext is broken there,
and so I am disabling it as an optional dependency here when building
on Darwin.
@cgevans
libunique: add darwin
45c9ad3 
libunique builds, and dependencies appear to build and run correctly,
in OS X.
veprbl
veprbl approved these changes Apr 2, 2020
View reviewed changes
Copy link
Member

@veprbl veprbl left a comment

Choose a reason for hiding this comment

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

Passes nixpkgs-review on x86_64-darwin:

3 package built:
gwyddion libunique python27Packages.gwyddion

@veprbl veprbl merged commit 99a236b into NixOS:master Apr 2, 2020
@veprbl
Copy link
Member

veprbl commented Apr 2, 2020

Thank you!

@cgevans cgevans deleted the gwyddion-darwin branch April 2, 2020 01:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@veprbl veprbl veprbl approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@cgevans @veprbl