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: 839c0c783f90
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 941d2765fd34
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Apr 26, 2020

  1. meson: Don't set CC and CXX 

    I've since convinced upstream to not use such vars for the build
platform during cross. Finally!
    @Ericson2314
    Ericson2314 committed Apr 26, 2020
    Copy the full SHA
    3c00ca0 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2020

  1. meson: Patch to ingest env vars like autoconf 

    See comment in code and the PR it references,
mesonbuild/meson#6827, for details.

We can remove entries from the cross file because they will be gotten
from env vars now.
    @Ericson2314
    Ericson2314 committed Apr 28, 2020
    Copy the full SHA
    128b93e View commit details
    Browse the repository at this point in the history

  2. meson: Make target-agnostic 

    The cross file is added in the `mkDerivation`. It isn't nice putting
build tool-specific stuff here, but our current architecture gives us
little alternative.
    @Ericson2314
    Ericson2314 committed Apr 28, 2020
    Copy the full SHA
    8245230 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #86080 from Ericson2314/fix-meson-cross 

    meson: Clean up build and infra
    @Ericson2314
    Ericson2314 committed Apr 28, 2020
    Copy the full SHA
    941d276 View commit details
    Browse the repository at this point in the history