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