diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 44b9471784c..adabdd71a1d 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -2,7 +2,7 @@ targets ? [], targetToolchains ? [], targetPatches ? [] }: let - rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}) rustPlatform); + rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); in rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0217c3451df..1f468d3e10b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5428,9 +5428,9 @@ in cargo = rust.cargo; rustc = rust.rustc; - rustPlatform = recurseIntoAttrs (makeRustPlatform rust rustPlatform); + rustPlatform = recurseIntoAttrs (makeRustPlatform rust); - makeRustPlatform = rust: self: + makeRustPlatform = rust: lib.fix (self: let callPackage = newScope self; in { @@ -5441,7 +5441,7 @@ in buildRustPackage = callPackage ../build-support/rust { inherit rust; }; - }; + }); rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { };