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: 632f69857d0a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d0ec32c4fd12
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 12, 2019

  1. Partially revert "busybox: fix musl builds" 

    Original commit 5ba8c04 destroyed the meaning
of the *overridable* flag, and incidentally we were
relying on it in channel-critical stuff:
https://hydra.nixos.org/build/102298542
    @vcunat
    vcunat committed Oct 12, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d0ec32c View commit details
Showing with 6 additions and 0 deletions.
  1. +6 −0 pkgs/os-specific/linux/busybox/default.nix
6 changes: 6 additions & 0 deletions pkgs/os-specific/linux/busybox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{ stdenv, lib, buildPackages, fetchurl
, enableStatic ? false
, enableMinimal ? false
# Allow forcing musl without switching stdenv itself, e.g. for our bootstrapping:
# nix build -f pkgs/top-level/release.nix stdenvBootstrapTools.x86_64-linux.dist
, useMusl ? stdenv.hostPlatform.libc == "musl", musl
, extraConfig ? ""
}:
@@ -88,6 +90,10 @@ stdenv.mkDerivation rec {
runHook postConfigure
'';

postConfigure = lib.optionalString (useMusl && stdenv.hostPlatform.libc != "musl") ''
makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib")
'';

depsBuildBuild = [ buildPackages.stdenv.cc ];

buildInputs = lib.optionals (enableStatic && !useMusl && stdenv.cc.libc ? static) [ stdenv.cc.libc stdenv.cc.libc.static ];