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: 453014b4561d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d282a7e07f4d
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Jun 13, 2020

  1. buildRustCrate: set CARGO_FEATURE_* when running the build script 

    Cargo sets `CARGO_FEATURE_*` for all features when running a build
script:

https://doc.rust-lang.org/cargo/reference/environment-variables.html#environment-variables-cargo-sets-for-build-scripts

Some crates have build scripts (e.g. openblas-src) that rely on the
feature variables being properly set.

Since we now need several representations of features, this change
also updates `createFeatures` to be a list of features, rather than
`rustc` feature arguments. `configureCrate` and `buildCrate` then
build the required representations as-needed.

Fixes #68978
    @danieldk
    danieldk committed Jun 13, 2020
    Copy the full SHA
    fe50bab View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2020

  1. Merge pull request #90193 from danieldk/build-rs-feature-env 

    buildRustCrate: set CARGO_FEATURE_* when running the build script
    @andir
    andir committed Jun 16, 2020
    Copy the full SHA
    d282a7e View commit details
    Browse the repository at this point in the history