From 4a1b07d0a984f0dcc54d0d70f057613b07b8260f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 10 Aug 2023 01:42:51 +0200 Subject: [PATCH] Fix lzbt build with recent nixos-unstable This fixes the following error: .... cargo-auditable> Doc-tests auditable-extract cargo-auditable> error: doctest failed, to rerun pass `-p auditable-extract --doc` cargo-auditable> cargo-auditable> Caused by: cargo-auditable> could not execute process `rustdoc --edition=2018 --crate-type lib --crate-name auditable_extract --test /build/source/auditable-extract/src/lib.rs --target x86_64-unknown-linux-gnu -L dependency=/build/source/target/x86_64-unknown-linux-gnu/release/deps -L dependency=/build/source/target/release/deps --test-args --test-threads=96 --extern auditable_extract=/build/source/target/x86_64-unknown-linux-gnu/release/deps/libauditable_extract-dd1904617e4b78db.rlib --extern binfarce=/build/source/target/x86_64-unknown-linux-gnu/release/deps/libbinfarce-2ba09d21aed0de1a.rlib -C embed-bitcode=no --error-format human` (never executed) cargo-auditable> cargo-auditable> Caused by: cargo-auditable> No such file or directory (os error 2) --- flake.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 2944070..11ff936 100644 --- a/flake.nix +++ b/flake.nix @@ -80,9 +80,16 @@ inherit (pkgs) lib; - stub = uefiPkgs.callPackage ./nix/packages/stub.nix { }; - fatStub = - uefiPkgs.callPackage ./nix/packages/stub.nix { fatVariant = true; }; + stub = uefiPkgs.callPackage ./nix/packages/stub.nix { + # cargo-auditable fails to build with: could not execute process .... No such file or directory (os error 2) + rustPlatform = uefiPkgs.makeRustPlatform { + inherit (uefiPkgs.buildPackages) rustc; + cargo = uefiPkgs.buildPackages.cargo.override { + auditable = false; + }; + }; + }; + fatStub = stub.override { fatVariant = true; }; tool = pkgs.callPackage ./nix/packages/tool.nix { }; wrappedTool = pkgs.runCommand "lzbt"