lol

cc-wrapper: Remove unused params

Ensured hashes unchanged and eval succeeds in tarball job

+7 -31
+1 -3
pkgs/build-support/cc-wrapper/default.nix
··· 8 { name ? "", stdenv, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" 9 , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell 10 , zlib ? null, extraPackages ? [], extraBuildCommands ? "" 11 - , dyld ? null # TODO: should this be a setup-hook on dyld? 12 , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null 13 - , buildPackages ? {}, hostPlatform, targetPlatform 14 - , runCommand ? null 15 , useMacosReexportHack ? false 16 }: 17
··· 8 { name ? "", stdenv, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" 9 , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell 10 , zlib ? null, extraPackages ? [], extraBuildCommands ? "" 11 , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null 12 + , buildPackages ? {} 13 , useMacosReexportHack ? false 14 }: 15
-6
pkgs/stdenv/darwin/default.nix
··· 77 cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { 78 inherit shell; 79 inherit (last) stdenv; 80 - inherit (last.pkgs.darwin) dyld; 81 82 nativeTools = true; 83 nativePrefix = bootstrapTools; ··· 85 buildPackages = lib.optionalAttrs (last ? stdenv) { 86 inherit (last) stdenv; 87 }; 88 - hostPlatform = localSystem; 89 - targetPlatform = localSystem; 90 libc = last.pkgs.darwin.Libsystem; 91 isClang = true; 92 cc = { name = "clang-9.9.9"; outPath = bootstrapTools; }; ··· 314 buildPackages = { 315 inherit (prevStage) stdenv; 316 }; 317 - hostPlatform = localSystem; 318 - targetPlatform = localSystem; 319 inherit (pkgs) coreutils binutils gnugrep; 320 - inherit (pkgs.darwin) dyld; 321 cc = pkgs.llvmPackages.clang-unwrapped; 322 libc = pkgs.darwin.Libsystem; 323 };
··· 77 cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { 78 inherit shell; 79 inherit (last) stdenv; 80 81 nativeTools = true; 82 nativePrefix = bootstrapTools; ··· 84 buildPackages = lib.optionalAttrs (last ? stdenv) { 85 inherit (last) stdenv; 86 }; 87 libc = last.pkgs.darwin.Libsystem; 88 isClang = true; 89 cc = { name = "clang-9.9.9"; outPath = bootstrapTools; }; ··· 311 buildPackages = { 312 inherit (prevStage) stdenv; 313 }; 314 inherit (pkgs) coreutils binutils gnugrep; 315 cc = pkgs.llvmPackages.clang-unwrapped; 316 libc = pkgs.darwin.Libsystem; 317 };
+4 -10
pkgs/stdenv/freebsd/default.nix
··· 40 targetPlatform = localSystem; 41 inherit config; 42 initialPath = [ "/" "/usr" ]; 43 - hostPlatform = localSystem; 44 - targetPlatform = localSystem; 45 shell = "${bootstrapTools}/bin/bash"; 46 fetchurlBoot = null; 47 cc = null; ··· 55 56 stdenv = import ../generic { 57 name = "stdenv-freebsd-boot-0"; 58 - buildPlatform = localSystem; 59 - hostPlatform = localSystem; 60 - targetPlatform = localSystem; 61 inherit config; 62 initialPath = [ prevStage.bootstrapTools ]; 63 inherit (prevStage.stdenv) 64 - hostPlatform targetPlatform shell; 65 fetchurlBoot = prevStage.fetchurl; 66 cc = null; 67 }; ··· 71 inherit config overlays; 72 stdenv = import ../generic { 73 name = "stdenv-freebsd-boot-3"; 74 - buildPlatform = localSystem; 75 - hostPlatform = localSystem; 76 - targetPlatform = localSystem; 77 inherit config; 78 79 inherit (prevStage.stdenv) 80 - hostPlatform targetPlatform initialPath shell fetchurlBoot; 81 82 cc = import ../../build-support/cc-wrapper { 83 nativeTools = true;
··· 40 targetPlatform = localSystem; 41 inherit config; 42 initialPath = [ "/" "/usr" ]; 43 shell = "${bootstrapTools}/bin/bash"; 44 fetchurlBoot = null; 45 cc = null; ··· 53 54 stdenv = import ../generic { 55 name = "stdenv-freebsd-boot-0"; 56 inherit config; 57 initialPath = [ prevStage.bootstrapTools ]; 58 inherit (prevStage.stdenv) 59 + buildPlatform hostPlatform targetPlatform 60 + shell; 61 fetchurlBoot = prevStage.fetchurl; 62 cc = null; 63 }; ··· 67 inherit config overlays; 68 stdenv = import ../generic { 69 name = "stdenv-freebsd-boot-3"; 70 inherit config; 71 72 inherit (prevStage.stdenv) 73 + buildPlatform hostPlatform targetPlatform 74 + initialPath shell fetchurlBoot; 75 76 cc = import ../../build-support/cc-wrapper { 77 nativeTools = true;
-4
pkgs/stdenv/linux/default.nix
··· 79 buildPackages = lib.optionalAttrs (prevStage ? stdenv) { 80 inherit (prevStage) stdenv; 81 }; 82 - hostPlatform = localSystem; 83 - targetPlatform = localSystem; 84 cc = prevStage.gcc-unwrapped; 85 isGNU = true; 86 libc = prevStage.glibc; ··· 244 buildPackages = { 245 inherit (prevStage) stdenv; 246 }; 247 - hostPlatform = localSystem; 248 - targetPlatform = localSystem; 249 cc = prevStage.gcc-unwrapped; 250 libc = self.glibc; 251 inherit (self) stdenv binutils coreutils gnugrep;
··· 79 buildPackages = lib.optionalAttrs (prevStage ? stdenv) { 80 inherit (prevStage) stdenv; 81 }; 82 cc = prevStage.gcc-unwrapped; 83 isGNU = true; 84 libc = prevStage.glibc; ··· 242 buildPackages = { 243 inherit (prevStage) stdenv; 244 }; 245 cc = prevStage.gcc-unwrapped; 246 libc = self.glibc; 247 inherit (self) stdenv binutils coreutils gnugrep;
+2 -6
pkgs/stdenv/nix/default.nix
··· 13 inherit config overlays; 14 15 stdenv = import ../generic rec { 16 - buildPlatform = localSystem; 17 - hostPlatform = localSystem; 18 - targetPlatform = localSystem; 19 20 - inherit config; 21 22 preHook = '' 23 export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}" ··· 26 ''; 27 28 initialPath = (import ../common-path.nix) { pkgs = prevStage; }; 29 - 30 - inherit (prevStage.stdenv) hostPlatform targetPlatform; 31 32 cc = import ../../build-support/cc-wrapper { 33 nativeTools = false;
··· 13 inherit config overlays; 14 15 stdenv = import ../generic rec { 16 + inherit config; 17 18 + inherit (prevStage.stdenv) buildPlatform hostPlatform targetPlatform; 19 20 preHook = '' 21 export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}" ··· 24 ''; 25 26 initialPath = (import ../common-path.nix) { pkgs = prevStage; }; 27 28 cc = import ../../build-support/cc-wrapper { 29 nativeTools = false;
-2
pkgs/top-level/all-packages.nix
··· 6063 nativeLibc = stdenv.cc.nativeLibc or false; 6064 nativePrefix = stdenv.cc.nativePrefix or ""; 6065 cc = baseCC; 6066 - dyld = if stdenv.isDarwin then darwin.dyld else null; 6067 isGNU = baseCC.isGNU or false; 6068 isClang = baseCC.isClang or false; 6069 inherit libc extraBuildCommands; ··· 6089 nativeLibc = false; 6090 noLibc = (libc == null); 6091 6092 - dyld = if stdenv.isDarwin then darwin.dyld else null; 6093 isGNU = cc.isGNU or false; 6094 isClang = cc.isClang or false; 6095
··· 6063 nativeLibc = stdenv.cc.nativeLibc or false; 6064 nativePrefix = stdenv.cc.nativePrefix or ""; 6065 cc = baseCC; 6066 isGNU = baseCC.isGNU or false; 6067 isClang = baseCC.isClang or false; 6068 inherit libc extraBuildCommands; ··· 6088 nativeLibc = false; 6089 noLibc = (libc == null); 6090 6091 isGNU = cc.isGNU or false; 6092 isClang = cc.isClang or false; 6093