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

readline: Don't attempt to check for broken wcwidth #33576

Merged
merged 1 commit into from Jan 8, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jan 7, 2018

The test requires running code on the target.

Motivation for this change

Before this change, readline does not currently build when cross-compiling.

Reviewers can confirm by trying this with and without this fix:

$ nix-build --arg crossSystem '(import ./lib).systems.examples.raspberryPi' -A readline
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
    • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@@ -16,6 +16,12 @@ stdenv.mkDerivation rec {

patchFlags = "-p0";

configureFlags =
stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
[ # This test requires running target code
Copy link
Member

Choose a reason for hiding this comment

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

should be "host", fixing

The test requires running code on the target.
@Ericson2314 Ericson2314 changed the base branch from staging to master January 8, 2018 07:59
@Ericson2314
Copy link
Member

Tested, in this configure test forcing is indeed still needed. Thanks you both!

@Ericson2314 Ericson2314 merged commit 0fb7245 into NixOS:master Jan 8, 2018
@Ericson2314 Ericson2314 added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Jan 9, 2018
@Ericson2314 Ericson2314 added this to @bgamari's numerous fixes in Cross compilation Jan 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
No open projects
Cross compilation
@bgamari's and @dtzWill's num...
Development

Successfully merging this pull request may close these issues.

None yet

4 participants