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

Commits on Jul 25, 2017

  1. stdenvLinux: Remove bootstrapTools from closure 

    The "expand-response-params" program had an unnecessary reference to
bootstrapTools, bloating the closure from 205 to 314 MiB.
    @edolstra
    edolstra committed Jul 25, 2017
    3
    Copy the full SHA
    b9c403c View commit details

  2. cc-wrapper: Add a "man" output 

    ... and propagate cc.man from there.
    @edolstra
    edolstra committed Jul 25, 2017
    Copy the full SHA
    70d4d22 View commit details
Showing with 6 additions and 2 deletions.
  1. +6 −2 pkgs/build-support/cc-wrapper/default.nix
8 changes: 6 additions & 2 deletions pkgs/build-support/cc-wrapper/default.nix
View file
Original file line number Diff line number Diff line change
@@ -130,6 +130,8 @@ let
# Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c"
cp "$src" expand-response-params.c
"$CC" -std=c99 -O3 -o "$out" expand-response-params.c
strip -S $out
${optionalString hostPlatform.isLinux "patchelf --shrink-rpath $out"}
'';
} else "";

@@ -145,6 +147,7 @@ stdenv.mkDerivation {
inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin;
gnugrep_bin = if nativeTools then "" else gnugrep;

outputs = [ "out" "man" ];

passthru = {
inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile
@@ -164,7 +167,7 @@ stdenv.mkDerivation {

buildCommand =
''
mkdir -p $out/bin $out/nix-support
mkdir -p $out/bin $out/nix-support $man/nix-support
wrap() {
local dst="$1"
@@ -275,7 +278,8 @@ stdenv.mkDerivation {
# Propagate the wrapped cc so that if you install the wrapper,
# you get tools like gcov, the manpages, etc. as well (including
# for binutils and Glibc).
echo ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
echo ${cc} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
echo ${cc.man or ""} > $man/nix-support/propagated-user-env-packages
echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
''