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

Commits on Sep 9, 2019

  1. Revert "busybox: fix static builds" 

    This reverts commit b4f6931.

Broke busybox-sandbox-shell

https://hydra.nixos.org/build/100470231
    @matthewbauer
    matthewbauer committed Sep 9, 2019
    Copy the full SHA
    78879ae View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 pkgs/os-specific/linux/busybox/default.nix
6 changes: 5 additions & 1 deletion pkgs/os-specific/linux/busybox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, lib, buildPackages, fetchurl
, enableStatic ? false
, enableMinimal ? false
, useMusl ? stdenv.hostPlatform.libc == "musl"
, useMusl ? stdenv.hostPlatform.libc == "musl", musl
, extraConfig ? ""
}:

@@ -88,6 +88,10 @@ stdenv.mkDerivation rec {
runHook postConfigure
'';

postConfigure = lib.optionalString useMusl ''
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 ];