From b909a333ad95dac6361fcd5ef7e09d33cd73509d Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 7 Dec 2020 22:27:42 +0100 Subject: [PATCH] rustc: generate deterministic manifest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The order of the entries in the manifest generated while installing rustc depends on the (parallel) build, so let's sort it to make it deterministic. Also remove install.log from the output. Co-Authored-By: Jörg Thalheim --- pkgs/development/compilers/rust/rustc.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 65d8920c4a4c..0b6266b9e674 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -141,6 +141,11 @@ in stdenv.mkDerivation rec { python x.py dist rustc-dev tar xf build/dist/rustc-dev*tar.gz cp -r rustc-dev*/rustc-dev*/lib/* $out/lib/ + rm $out/lib/rustlib/install.log + for m in $out/lib/rustlib/manifest-rust* + do + sort --output=$m < $m + done '' + '' # remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so