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

nss: fix build on ppc64[le] #102428

Merged
merged 1 commit into from Nov 15, 2020
Merged

nss: fix build on ppc64[le] #102428

merged 1 commit into from Nov 15, 2020

Conversation

r-burns
Copy link
Contributor

@r-burns r-burns commented Nov 2, 2020

NSS configure scripts use the abbreviated form ppc64/ppc64le:
https://github.com/nss-dev/nss/blob/NSS_3_57_RTM/coreconf/config.gypi#L209

Whereas nixpkgs uses the longer form:
nix eval nixpkgs.pkgsCross.powernv.hostPlatform.parsed.cpu.name
powerpc64le

cc @CrystalGamma

Motivation for this change
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.

NSS configure scripts use the abbreviated form ppc64/ppc64le:
https://github.com/nss-dev/nss/blob/NSS_3_57_RTM/coreconf/config.gypi#L209

Whereas nixpkgs uses the longer form:
`nix eval nixpkgs.pkgsCross.powernv.hostPlatform.parsed.cpu.name`
`powerpc64le`
Copy link
Contributor

@CrystalGamma CrystalGamma left a comment

Choose a reason for hiding this comment

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

Yup, that's pretty much the exact patch I wanted to PR in the coming days :)

@r-burns
Copy link
Contributor Author

r-burns commented Nov 14, 2020

/marvin opt-in
/status needs_merger

@marvin-mk2 marvin-mk2 bot added the marvin label Nov 14, 2020
@marvin-mk2
Copy link

marvin-mk2 bot commented Nov 14, 2020

Hi! I'm an experimental bot. My goal is to guide this PR through its stages, hopefully ending with a merge. You can read up on the usage here.

@marvin-mk2
Copy link

marvin-mk2 bot commented Nov 14, 2020

The PR author cannot set the status to needs_merger. Please wait for an external review.

If you are not the PR author and you are reading this, please review the usage of this bot. You may be able to help. Please make an honest attempt to resolve all outstanding issues before setting to needs_merger.

@ajs124
Copy link
Member

ajs124 commented Nov 15, 2020

Is there anyone that has access to this platform and has merge permissions?

@7c6f434c 7c6f434c merged commit 15430f8 into NixOS:master Nov 15, 2020
@7c6f434c
Copy link
Member

Makes enough sense to merge without testing if noone is available to re-test…

@r-burns r-burns deleted the nss branch November 15, 2020 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants