Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0b70148bd6d0
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f9c4075873cb
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 26, 2018

  1. stdenv: partial revert of f2bb59e 

    /cc @Ericson2314

PR was NixOS/nixpkgs#46857

This line broke MacOS cross compilation. paxctl cannot be built on
macOS. Maybe it can be fixed, but no reason to break things
unnecessarily.

Regardless, you definitely need to be more careful about backporting.
I think it’s fine to move fast and break things on master but
with release-18.09 we should be more careful. Something like more
automated testing for cross compilation would also be
helpful (hopefully even making it block).
    @matthewbauer
    matthewbauer committed Sep 26, 2018
    Copy the full SHA
    f9c4075 View commit details
Showing with 0 additions and 3 deletions.
  1. +0 −3 pkgs/stdenv/cross/default.nix
3 changes: 0 additions & 3 deletions pkgs/stdenv/cross/default.nix
View file
Original file line number Diff line number Diff line change
@@ -53,9 +53,6 @@ in lib.init bootStages ++ [
else buildPackages.gcc;

extraNativeBuildInputs = old.extraNativeBuildInputs
++ lib.optionals
(hostPlatform.isLinux && !buildPlatform.isLinux)
[ buildPackages.patchelf buildPackages.paxctl ]
++ lib.optional
(let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform))
buildPackages.updateAutotoolsGnuConfigScriptsHook