diff options
| author | John Ericson <subscribe@JohnEricson.me> | 2018-09-25 00:04:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 00:04:52 -0400 |
| commit | 2b4b7d4ef3bba661fbafbced814a8b39c65ea81a (patch) | |
| tree | b1fc6b9d9fd9227922f98ed05abc27e04fec32dd /pkgs/build-support | |
| parent | b1d518206a65e99b9b4b79fa2b10162a9d8e4486 (diff) | |
| parent | 87c02060383a689e81749643a39dbcc3c4fc6ad1 (diff) | |
| download | nixlib-2b4b7d4ef3bba661fbafbced814a8b39c65ea81a.tar nixlib-2b4b7d4ef3bba661fbafbced814a8b39c65ea81a.tar.gz nixlib-2b4b7d4ef3bba661fbafbced814a8b39c65ea81a.tar.bz2 nixlib-2b4b7d4ef3bba661fbafbced814a8b39c65ea81a.tar.lz nixlib-2b4b7d4ef3bba661fbafbced814a8b39c65ea81a.tar.xz nixlib-2b4b7d4ef3bba661fbafbced814a8b39c65ea81a.tar.zst nixlib-2b4b7d4ef3bba661fbafbced814a8b39c65ea81a.zip | |
Merge pull request #47233 from oxij/tree/mass-rebuild-noop-cleanups
treewide: mass rebuild noop cleanups
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 7948f726c629..f9ca245beea6 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -6,9 +6,10 @@ # compiler and the linker just "work". { name ? "" -, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" -, bintools ? null, libc ? null -, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null +, stdenvNoCC +, bintools ? null, libc ? null, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null +, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" +, propagateDoc ? bintools != null && bintools ? man , extraPackages ? [], extraBuildCommands ? "" , buildPackages ? {} , useMacosReexportHack ? false diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 301bc2694c4f..e59758371a38 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -6,8 +6,10 @@ # compiler and the linker just "work". { name ? "" -, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" +, stdenvNoCC , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell +, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" +, propagateDoc ? cc != null && cc ? man , extraPackages ? [], extraBuildCommands ? "" , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} |