···102102stdenv.mkDerivation {
103103 pname = targetPrefix
104104 + (if name != "" then name else "${bintoolsName}-wrapper");
105105- version = if bintools == null then null else bintoolsVersion;
105105+ version = if bintools == null then "" else bintoolsVersion;
106106107107 preferLocalBuild = true;
108108
+5-2
pkgs/build-support/cc-wrapper/default.nix
···160160stdenv.mkDerivation {
161161 pname = targetPrefix
162162 + (if name != "" then name else "${ccName}-wrapper");
163163- version = if cc == null then null else ccVersion;
163163+ version = if cc == null then "" else ccVersion;
164164165165 preferLocalBuild = true;
166166···597597 expandResponseParams = "${expand-response-params}/bin/expand-response-params";
598598 shell = getBin shell + shell.shellPath or "";
599599 gnugrep_bin = if nativeTools then "" else gnugrep;
600600+ # stdenv.cc.cc should not be null and we have nothing better for now.
601601+ # if the native impure bootstrap is gotten rid of this can become `inherit cc;` again.
602602+ cc = if nativeTools then "" else cc;
600603 wrapperName = "CC_WRAPPER";
601601- inherit suffixSalt coreutils_bin bintools cc;
604604+ inherit suffixSalt coreutils_bin bintools;
602605 inherit libc_bin libc_dev libc_lib;
603606 inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable;
604607 };
···44 pname = "clippy";
55 inherit (rustPlatform.rust.rustc) version src;
6677+ separateDebugInfo = true;
88+79 # the rust source tarball already has all the dependencies vendored, no need to fetch them again
810 cargoVendorDir = "vendor";
911 buildAndTestSubdir = "src/tools/clippy";
···309309 hostSuffix = lib.optionalString
310310 (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)
311311 "-${stdenv.hostPlatform.config}";
312312+312313 # Disambiguate statically built packages. This was originally
313314 # introduce as a means to prevent nix-env to get confused between
314315 # nix and nixStatic. This should be also achieved by moving the
···319320 lib.strings.sanitizeDerivationName (
320321 if attrs ? name
321322 then attrs.name + hostSuffix
322322- else "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"
323323+ else
324324+ # we cannot coerce null to a string below
325325+ assert lib.assertMsg (attrs ? version && attrs.version != null) "The ‘version’ attribute cannot be null.";
326326+ "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"
323327 );
324328 }) // lib.optionalAttrs __structuredAttrs { env = checkedEnv; } // {
325329 builder = attrs.realBuilder or stdenv.shell;