diff options
author | John Ericson <Ericson2314@Yahoo.com> | 2016-07-09 00:01:49 -0700 |
---|---|---|
committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-07-15 10:13:21 +0200 |
commit | bed2a14afaf720ca9f2c0f6a747ca8f8490ddbab (patch) | |
tree | ad70611a3e767c95afef7de8da3ce696848e3ef0 /pkgs | |
parent | 0ad8d0b127bfbbb03c61776f4f913cd7a6b93f18 (diff) | |
download | nixlib-bed2a14afaf720ca9f2c0f6a747ca8f8490ddbab.tar nixlib-bed2a14afaf720ca9f2c0f6a747ca8f8490ddbab.tar.gz nixlib-bed2a14afaf720ca9f2c0f6a747ca8f8490ddbab.tar.bz2 nixlib-bed2a14afaf720ca9f2c0f6a747ca8f8490ddbab.tar.lz nixlib-bed2a14afaf720ca9f2c0f6a747ca8f8490ddbab.tar.xz nixlib-bed2a14afaf720ca9f2c0f6a747ca8f8490ddbab.tar.zst nixlib-bed2a14afaf720ca9f2c0f6a747ca8f8490ddbab.zip |
makeRustPlatform: Remove `self` argument
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/compilers/rust/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 44b9471784c6..adabdd71a1dd 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 0217c3451dfc..1f468d3e10b5 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 { }; |