From aa9a04883e34f6a7b89846e87654577d5b218f46 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 23 Jun 2016 09:25:10 +0200 Subject: Revert "Merge branch 'staging'" due to glibc The main output started to retain dependency on bootstrap-tools; see https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096 This reverts commit c05d8295988697adbb920a7b4a999ae3670c5504, reversing changes made to f073df60d60444c30c49cb26d6b187a4100b41fe. --- pkgs/build-support/cc-wrapper/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/build-support/cc-wrapper/default.nix') diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index a37c806905fd..da114fdb347f 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -96,7 +96,6 @@ stdenv.mkDerivation { echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags echo "${libc_lib}" > $out/nix-support/orig-libc - echo "${libc_dev}" > $out/nix-support/orig-libc-dev '' + (if nativeTools then '' -- cgit 1.4.1