Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 404fe35d6517
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: bf60834d6dfa
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 14, 2020

  1. nss: fix building for aarch32 on aarch64 

    There are two ways to build a package for aarch32 on an aarch64 machine:
either by cross compiling as normal, or by adding armv6l/armv7l to
extraPlatforms and doing a non-cross compile.

Previously, NSS failed to build with both methods: when using
extraPlatforms, things failed because NSS includes an armv8-specific
file (presumably based on the result of uname); when cross compiling,
NSS's build system expects to receive an architecture name of arm (not
armv6l or whatever), so was failing to include some arch-specific code
and failed with a linker error.

This commit fixes those things by a) always passing the arch, even when
not cross-compiling, and b) special-casing aarch32 to always pass in an
arch of arm.
    @Gaelan
    Gaelan committed May 14, 2020
    Copy the full SHA
    b14d997 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #87748 from Gaelan/nss-arm-fix 

    nss: fix building for aarch32 on aarch64
    @andir
    andir committed May 14, 2020
    Copy the full SHA
    bf60834 View commit details
    Browse the repository at this point in the history