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

gwrap: remove unnecessary checks #21344

Merged
merged 1 commit into from Jan 24, 2017
Merged

gwrap: remove unnecessary checks #21344

merged 1 commit into from Jan 24, 2017

Conversation

mdaiter
Copy link
Contributor

@mdaiter mdaiter commented Dec 21, 2016

Motivation for this change

Within gwrap, an OS check is performed to see if the system is using FreeBSD to include a package. However, the gwrap package is set to only build for Linux. Even if the package is set to build for Linux and FreeBSD, a dependency (guile_lib) only builds on GNU platforms, which is currently set to only Linux.

We should remove this unnecessary check, or we should get this package and all dependencies to build (if able) on Linux and FreeBSD.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@mdaiter, thanks for your PR! By analyzing the history of the files in this pull request, we identified @taktoa, @grahamc and @Fuuzetsu to be potential reviewers.


propagatedBuildInputs = [ libffi ];

doCheck = !stdenv.isFreeBSD; # XXX: 00-socket.test hangs
Copy link
Contributor

Choose a reason for hiding this comment

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

Note that doCheck defaults to false; this PR effectively disables the check phase.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We could change this to doCheck = true;

Copy link
Contributor

Choose a reason for hiding this comment

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

Yup

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed!

@mdaiter
Copy link
Contributor Author

mdaiter commented Jan 23, 2017

Ping?

@grahamc grahamc merged commit 5c84eaa into NixOS:master Jan 24, 2017
@grahamc
Copy link
Member

grahamc commented Jan 24, 2017

Thank you for the ping :) sorry it took so long!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants