···102stdenv.mkDerivation {
103 pname = targetPrefix
104 + (if name != "" then name else "${bintoolsName}-wrapper");
105- version = if bintools == null then null else bintoolsVersion;
106107 preferLocalBuild = true;
108
···102stdenv.mkDerivation {
103 pname = targetPrefix
104 + (if name != "" then name else "${bintoolsName}-wrapper");
105+ version = if bintools == null then "" else bintoolsVersion;
106107 preferLocalBuild = true;
108
+5-2
pkgs/build-support/cc-wrapper/default.nix
···160stdenv.mkDerivation {
161 pname = targetPrefix
162 + (if name != "" then name else "${ccName}-wrapper");
163- version = if cc == null then null else ccVersion;
164165 preferLocalBuild = true;
166···597 expandResponseParams = "${expand-response-params}/bin/expand-response-params";
598 shell = getBin shell + shell.shellPath or "";
599 gnugrep_bin = if nativeTools then "" else gnugrep;
000600 wrapperName = "CC_WRAPPER";
601- inherit suffixSalt coreutils_bin bintools cc;
602 inherit libc_bin libc_dev libc_lib;
603 inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable;
604 };
···160stdenv.mkDerivation {
161 pname = targetPrefix
162 + (if name != "" then name else "${ccName}-wrapper");
163+ version = if cc == null then "" else ccVersion;
164165 preferLocalBuild = true;
166···597 expandResponseParams = "${expand-response-params}/bin/expand-response-params";
598 shell = getBin shell + shell.shellPath or "";
599 gnugrep_bin = if nativeTools then "" else gnugrep;
600+ # stdenv.cc.cc should not be null and we have nothing better for now.
601+ # if the native impure bootstrap is gotten rid of this can become `inherit cc;` again.
602+ cc = if nativeTools then "" else cc;
603 wrapperName = "CC_WRAPPER";
604+ inherit suffixSalt coreutils_bin bintools;
605 inherit libc_bin libc_dev libc_lib;
606 inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable;
607 };
···4 pname = "clippy";
5 inherit (rustPlatform.rust.rustc) version src;
6007 # the rust source tarball already has all the dependencies vendored, no need to fetch them again
8 cargoVendorDir = "vendor";
9 buildAndTestSubdir = "src/tools/clippy";
···4 pname = "clippy";
5 inherit (rustPlatform.rust.rustc) version src;
67+ separateDebugInfo = true;
8+9 # the rust source tarball already has all the dependencies vendored, no need to fetch them again
10 cargoVendorDir = "vendor";
11 buildAndTestSubdir = "src/tools/clippy";
···309 hostSuffix = lib.optionalString
310 (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)
311 "-${stdenv.hostPlatform.config}";
0312 # Disambiguate statically built packages. This was originally
313 # introduce as a means to prevent nix-env to get confused between
314 # nix and nixStatic. This should be also achieved by moving the
···319 lib.strings.sanitizeDerivationName (
320 if attrs ? name
321 then attrs.name + hostSuffix
322- else "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"
000323 );
324 }) // lib.optionalAttrs __structuredAttrs { env = checkedEnv; } // {
325 builder = attrs.realBuilder or stdenv.shell;
···309 hostSuffix = lib.optionalString
310 (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix)
311 "-${stdenv.hostPlatform.config}";
312+313 # Disambiguate statically built packages. This was originally
314 # introduce as a means to prevent nix-env to get confused between
315 # nix and nixStatic. This should be also achieved by moving the
···320 lib.strings.sanitizeDerivationName (
321 if attrs ? name
322 then attrs.name + hostSuffix
323+ else
324+ # we cannot coerce null to a string below
325+ assert lib.assertMsg (attrs ? version && attrs.version != null) "The ‘version’ attribute cannot be null.";
326+ "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"
327 );
328 }) // lib.optionalAttrs __structuredAttrs { env = checkedEnv; } // {
329 builder = attrs.realBuilder or stdenv.shell;