Skip to content

Commit

Permalink
Don't rely on unstable flags
Browse files Browse the repository at this point in the history
  • Loading branch information
dpc authored and nmattia committed Sep 7, 2021
1 parent df71f5e commit 08afb3d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions build.nix
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ let
# threads as there are cores. This is often too much parallelism so we
# reduce it to $NIX_BUILD_CORES if not specified by the caller.
export RUST_TEST_THREADS="''${RUST_TEST_THREADS:-$NIX_BUILD_CORES}"
export CARGO_TARGET_DIR="out"
log "cargo_version (read): $cargo_version"
log "cargo_message_format (set): $cargo_message_format"
Expand Down
6 changes: 3 additions & 3 deletions config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ let
# Options passed to cargo build, i.e. `cargo build <OPTS>`. These options
# can be accessed during the build through the environment variable
# `cargo_build_options`. <br/>
# Note: naersk relies on the `--out-dir out` option and the
# Note: naersk relies on the the
# `--message-format` option. The `$cargo_message_format` variable is set
# based on the cargo version.<br/>
# Note: these values are not (shell) escaped, meaning that you can use
# environment variables but must be careful when introducing e.g. spaces. <br/>
cargoBuildOptions =
allowFun attrs0 "cargoBuildOptions" [ "$cargo_release" ''-j "$NIX_BUILD_CORES"'' "--out-dir" "out" "--message-format=$cargo_message_format" ];
allowFun attrs0 "cargoBuildOptions" [ "$cargo_release" ''-j "$NIX_BUILD_CORES"'' "--message-format=$cargo_message_format" ];


# When `true`, rustc remaps the (`/nix/store`) source paths to `/sources`
Expand Down Expand Up @@ -71,7 +71,7 @@ let
# Note: these values are not (shell) escaped, meaning that you can use
# environment variables but must be careful when introducing e.g. spaces. <br/>
cargoOptions =
allowFun attrs0 "cargoOptions" [ "-Z" "unstable-options" ];
allowFun attrs0 "cargoOptions" [ ];

# When true, `cargo doc` is run and a new output `doc` is generated.
doDoc = attrs0.doDoc or false;
Expand Down

0 comments on commit 08afb3d

Please sign in to comment.