diff options
Diffstat (limited to 'pkgs/build-support/rust')
-rw-r--r-- | pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix | 32 | ||||
-rw-r--r-- | pkgs/build-support/rust/default.nix | 4 |
2 files changed, 18 insertions, 18 deletions
diff --git a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix index 068cc5a9884..abf5fedbf79 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix @@ -52,20 +52,20 @@ rec { features = mkFeatures (features.brotli_2_5_0 or {}); }; brotli_2_5_0_features = f: updateFeatures f (rec { - alloc_no_stdlib_1_3_0."no-stdlib" = - (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) || - (brotli_2_5_0."no-stdlib" or false) || - (f.brotli_2_5_0."no-stdlib" or false); + alloc_no_stdlib_1_3_0.no-stdlib = + (f.alloc_no_stdlib_1_3_0.no-stdlib or false) || + (brotli_2_5_0.no-stdlib or false) || + (f.brotli_2_5_0.no-stdlib or false); alloc_no_stdlib_1_3_0.default = true; brotli_2_5_0.default = (f.brotli_2_5_0.default or true); - brotli_decompressor_1_3_1."disable-timer" = - (f.brotli_decompressor_1_3_1."disable-timer" or false) || - (brotli_2_5_0."disable-timer" or false) || - (f.brotli_2_5_0."disable-timer" or false); - brotli_decompressor_1_3_1."no-stdlib" = - (f.brotli_decompressor_1_3_1."no-stdlib" or false) || - (brotli_2_5_0."no-stdlib" or false) || - (f.brotli_2_5_0."no-stdlib" or false); + brotli_decompressor_1_3_1.disable-timer = + (f.brotli_decompressor_1_3_1.disable-timer or false) || + (brotli_2_5_0.disable-timer or false) || + (f.brotli_2_5_0.disable-timer or false); + brotli_decompressor_1_3_1.no-stdlib = + (f.brotli_decompressor_1_3_1.no-stdlib or false) || + (brotli_2_5_0.no-stdlib or false) || + (f.brotli_2_5_0.no-stdlib or false); brotli_decompressor_1_3_1.benchmark = (f.brotli_decompressor_1_3_1.benchmark or false) || (brotli_2_5_0.benchmark or false) || @@ -81,10 +81,10 @@ rec { features = mkFeatures (features.brotli_decompressor_1_3_1 or {}); }; brotli_decompressor_1_3_1_features = f: updateFeatures f (rec { - alloc_no_stdlib_1_3_0."no-stdlib" = - (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) || - (brotli_decompressor_1_3_1."no-stdlib" or false) || - (f.brotli_decompressor_1_3_1."no-stdlib" or false); + alloc_no_stdlib_1_3_0.no-stdlib = + (f.alloc_no_stdlib_1_3_0.no-stdlib or false) || + (brotli_decompressor_1_3_1.no-stdlib or false) || + (f.brotli_decompressor_1_3_1.no-stdlib or false); alloc_no_stdlib_1_3_0.default = true; alloc_no_stdlib_1_3_0.unsafe = (f.alloc_no_stdlib_1_3_0.unsafe or false) || diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 09802d56d34..ce1bf800276 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -44,8 +44,8 @@ let hostConfig = stdenv.hostPlatform.config; rustHostConfig = { - "x86_64-pc-mingw32" = "x86_64-pc-windows-gnu"; - }."${hostConfig}" or hostConfig; + x86_64-pc-mingw32 = "x86_64-pc-windows-gnu"; + }.${hostConfig} or hostConfig; ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; |