diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-10-08 10:20:07 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-10-08 10:20:07 +0200 |
| commit | 6565abc264549742c9cddcb547506a2c245d6b2b (patch) | |
| tree | 5e770f59e8665e8de346bcf41c41a353cd4e0f44 /pkgs/development/compilers/rust | |
| parent | bc2ce9630aa6d0dc28105becb260988136cd9ef6 (diff) | |
| parent | b078ae79375573c7af1f7952db3eae5e337e6572 (diff) | |
| download | nixlib-6565abc264549742c9cddcb547506a2c245d6b2b.tar nixlib-6565abc264549742c9cddcb547506a2c245d6b2b.tar.gz nixlib-6565abc264549742c9cddcb547506a2c245d6b2b.tar.bz2 nixlib-6565abc264549742c9cddcb547506a2c245d6b2b.tar.lz nixlib-6565abc264549742c9cddcb547506a2c245d6b2b.tar.xz nixlib-6565abc264549742c9cddcb547506a2c245d6b2b.tar.zst nixlib-6565abc264549742c9cddcb547506a2c245d6b2b.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/compilers/rust')
| -rw-r--r-- | pkgs/development/compilers/rust/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 7c78a784575a..ef01cbf2abc1 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -28,7 +28,7 @@ in lib = lib'; # Backwards compat before `lib` was factored out. - inherit (lib') toTargetArch toTargetOs toRustTarget toRustTargetSpec; + inherit (lib') toTargetArch toTargetOs toRustTarget toRustTargetSpec IsNoStdTarget; # This just contains tools for now. But it would conceivably contain # libraries too, say if we picked some default/recommended versions from diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index bd883d1bea86..e3c20bebd499 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -107,6 +107,8 @@ in stdenv.mkDerivation rec { "${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}" ] ++ optionals stdenv.targetPlatform.isMusl [ "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}" + ] ++ optionals (rust.IsNoStdTarget stdenv.targetPlatform) [ + "--disable-docs" ] ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [ # https://github.com/rust-lang/rust/issues/92173 "--set rust.jemalloc" |