diff options
author | John Ericson <mail@JohnEricson.me> | 2018-08-31 09:56:10 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-31 09:56:10 -0400 |
commit | 2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93 (patch) | |
tree | 46c1a6242a2243d6d6bd04d0dcb234056bc01c14 /doc | |
parent | f7606a82ed6bbf93c015c01b4067c7529ab3e74e (diff) | |
parent | 0828e2d8c369604c56219bd7085256b984087280 (diff) | |
download | nixpkgs-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar nixpkgs-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.gz nixpkgs-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.bz2 nixpkgs-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.lz nixpkgs-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.xz nixpkgs-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.zst nixpkgs-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.zip |
Merge pull request #45820 from obsidiansystems/dont-use-obsolete-platform-aliases
treewide: Dont use obsolete platform aliases
Diffstat (limited to 'doc')
-rw-r--r-- | doc/languages-frameworks/rust.section.md | 8 | ||||
-rw-r--r-- | doc/old/cross.txt | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index eec982d4c90..6588281878a 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -93,8 +93,8 @@ Now, the file produced by the call to `carnix`, called `hello.nix`, looks like: ``` # Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone -{ lib, buildPlatform, buildRustCrate, fetchgit }: -let kernel = buildPlatform.parsed.kernel.name; +{ lib, stdenv, buildRustCrate, fetchgit }: +let kernel = stdenv.buildPlatform.parsed.kernel.name; # ... (content skipped) in rec { @@ -122,8 +122,8 @@ following nix file: ``` # Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone -{ lib, buildPlatform, buildRustCrate, fetchgit }: -let kernel = buildPlatform.parsed.kernel.name; +{ lib, stdenv, buildRustCrate, fetchgit }: +let kernel = stdenv.buildPlatform.parsed.kernel.name; # ... (content skipped) in rec { diff --git a/doc/old/cross.txt b/doc/old/cross.txt index c0885c08176..ff9fefb04a8 100644 --- a/doc/old/cross.txt +++ b/doc/old/cross.txt @@ -78,7 +78,7 @@ Step 2: build kernel headers for the target architecture --- {stdenv, fetchurl}: -assert stdenv.system == "i686-linux"; +assert stdenv.buildPlatform.system == "i686-linux"; stdenv.mkDerivation { name = "linux-headers-2.6.13.1-arm"; |