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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 14a008dba64a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 59c81160e7df
Choose a head ref
  • 8 commits
  • 15 files changed
  • 3 contributors

Commits on Mar 28, 2019

  1. wafHook: let derivations use an existing waf in a non-standard location 

    this is necessary for talloc
    @symphorien
    symphorien committed Mar 28, 2019
    Copy the full SHA
    f075de5 View commit details

  2. wafHook: ignore --disable-static and such options 

    These options are forcefully added by pkgsStatic but are not understood
by waf.
    @symphorien
    symphorien committed Mar 28, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f23a215 View commit details

  3. wafHook: ignore configurePlatforms 

    waf does support --build and --host, but the only effect of these
options is an error message telling to use --cross-compile instead.
So we ignore these flags.
    @symphorien
    symphorien committed Mar 28, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1001d00 View commit details

  4. wafHook: cross compilation support 

    for this to work, wafHook must be in nativeBuildInputs.
    @symphorien
    symphorien committed Mar 28, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3d60a00 View commit details

  5. talloc, tdb: fix cross-compilation after wafHook improvements

    @symphorien
    symphorien committed Mar 28, 2019
    Copy the full SHA
    cbd9409 View commit details

  6. proot: fix cross compilation

    @symphorien
    symphorien committed Mar 28, 2019
    Copy the full SHA
    52566c3 View commit details

Commits on Apr 10, 2019

  1. waf: use wafConfigureFlags for waf flags 

    This avoids the potential conflict between autoconf flags and the waf
flags. There is some overlap between the two but waf errors when it
doesn’t recognize the flag.
    @matthewbauer
    matthewbauer committed Apr 10, 2019
    Copy the full SHA
    a79a8f2 View commit details

Commits on Apr 13, 2019

  1. Merge pull request #58504 from symphorien/static-proot 

    Static proot, wafHook cross compilation
    @veprbl
    veprbl authored Apr 13, 2019
    Copy the full SHA
    59c8116 View commit details
Loading