cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

rust: allow building/git-bisecting without tarballs

Browse source 
This commit adds the machinery required to get our `rustc.nix` to
work using upstream's git repository, directly, without them waving
dead chickens over it and performing whatever other occult rituals
are involved in creating a release tarball.

No chickens, live or dead, were harmed in the creation of this
commit.
This commit is contained in:
Adam Joseph 2023-11-11 20:51:48 -08:00
parent b07a29c8fc
commit b6a3fabcc1
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/compilers/rust/default.nix
View file

@ -73,7 +73,7 @@ in
patches = rustcPatches;
# Use boot package set to break cycle
inherit (bootstrapRustPackages) cargo rustc;
inherit (bootstrapRustPackages) cargo rustc rustfmt;
});
rustfmt = self.callPackage ./rustfmt.nix {
inherit Security;

22
pkgs/development/compilers/rust/rustc.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, targetPackages
, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages
, fetchurl, file, python3
, darwin, cargo, cmake, rust, rustc
, darwin, cargo, cmake, rust, rustc, rustfmt
, pkg-config, openssl, xz
, libiconv
, which, libffi
@ -24,13 +24,15 @@
let
inherit (lib) optionals optional optionalString concatStringsSep;
inherit (darwin.apple_sdk.frameworks) Security;
in stdenv.mkDerivation rec {
in stdenv.mkDerivation (finalAttrs: {
pname = "${targetPackages.stdenv.cc.targetPrefix}rustc";
inherit version;
src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
inherit sha256;
# See https://nixos.org/manual/nixpkgs/stable/#using-git-bisect-on-the-rust-compiler
passthru.isReleaseTarball = true;
};
__darwinAllowLocalNetworking = true;
@ -79,6 +81,12 @@ in stdenv.mkDerivation rec {
"--release-channel=stable"
"--set=build.rustc=${rustc}/bin/rustc"
"--set=build.cargo=${cargo}/bin/cargo"
] ++ lib.optionals (!(finalAttrs.src.passthru.isReleaseTarball or false)) [
# release tarballs vendor the rustfmt source; when
# git-bisect'ing from upstream's git repo we must prevent
# attempts to download the missing source tarball
"--set=build.rustfmt=${rustfmt}/bin/rustfmt"
] ++ [
"--tools=rustc,rust-analyzer-proc-macro-srv"
"--enable-rpath"
"--enable-vendor"
@ -203,6 +211,14 @@ in stdenv.mkDerivation rec {
# See https://github.com/jemalloc/jemalloc/issues/1997
# Using a value of 48 should work on both emulated and native x86_64-darwin.
export JEMALLOC_SYS_WITH_LG_VADDR=48
'' + lib.optionalString (!(finalAttrs.src.passthru.isReleaseTarball or false)) ''
mkdir .cargo
cat > .cargo/config <<\EOF
[source.crates-io]
replace-with = "vendored-sources"
[source.vendored-sources]
directory = "vendor"
EOF
'';
# rustc unfortunately needs cmake to compile llvm-rt but doesn't
@ -281,4 +297,4 @@ in stdenv.mkDerivation rec {
"i686-windows" "x86_64-windows"
];
};
}
})