Unverified Commit 5a852f2c authored by Gergő Gutyina's avatar Gergő Gutyina Committed by GitHub
Browse files

treewide: fix cargoTestFlags/cargoBuildFlags for structuredAttrs (#484699)

parents 459b40bc 58bcc7a4
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -34,8 +34,9 @@ rustPlatform.buildRustPackage (finalAttrs: {

  cargoBuildFlags = [ "-p=biome_cli" ];
  cargoTestFlags = finalAttrs.cargoBuildFlags ++ [
    "--"
    # fails due to cargo insta
    "-- --skip=commands::check::print_json"
    "--skip=commands::check::print_json"
    "--skip=commands::check::print_json_pretty"
    "--skip=commands::explain::explain_logs"
    "--skip=commands::format::print_json"
+4 −1
Original line number Diff line number Diff line
@@ -39,7 +39,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
      zstd
    ];

  cargoBuildFlags = [ "--package tauri-cli" ];
  cargoBuildFlags = [
    "--package"
    "tauri-cli"
  ];
  cargoTestFlags = finalAttrs.cargoBuildFlags;

  env = lib.optionalAttrs stdenv.hostPlatform.isLinux {
+8 −2
Original line number Diff line number Diff line
@@ -19,8 +19,14 @@ rustPlatform.buildRustPackage rec {

  cargoHash = "sha256-JpXjnkZHz12YxgTSqTcWdQTkrMugP7ZGw48145BeBZk=";

  cargoBuildFlags = [ "-p eludris" ];
  cargoTestFlags = [ "-p eludris" ];
  cargoBuildFlags = [
    "--package"
    "eludris"
  ];
  cargoTestFlags = [
    "--package"
    "eludris"
  ];
  buildInputs = [ openssl ];
  nativeBuildInputs = [ pkg-config ];

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  cargoHash = "sha256-HG0HZes01shEtuVK7QCYmy/zsU0snbwsqCtev7u3/WI=";

  # For aws-lc-sys@0.22.0: use external bindgen.
  AWS_LC_SYS_EXTERNAL_BINDGEN = "true";
  env.AWS_LC_SYS_EXTERNAL_BINDGEN = "true";

  # For aws-lc-sys@0.22.0: fix gcc error:
  # In function 'memcpy',
+8 −2
Original line number Diff line number Diff line
@@ -18,8 +18,14 @@ rustPlatform.buildRustPackage rec {
  };

  cargoHash = "sha256-pxEwcLiRB95UBfXb+JgS8duEXiZUApH/C8Exus5TkfU=";
  cargoBuildFlags = "--package flutter_rust_bridge_codegen";
  cargoTestFlags = "--package flutter_rust_bridge_codegen";
  cargoBuildFlags = [
    "--package"
    "flutter_rust_bridge_codegen"
  ];
  cargoTestFlags = [
    "--package"
    "flutter_rust_bridge_codegen"
  ];

  # needed to get tests running
  nativeBuildInputs = [ cargo-expand ];
Loading