treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`. These shorthands are not conducive to cross-compilation because they hide the platforms. Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way One example of why this is bad and especially affects compiler packages https://www.github.com/NixOS/nixpkgs/pull/343059 There are too many files to go through manually but a treewide should get users thinking when they see a `hostPlatform.isX` in a place where it doesn't make sense. ``` fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is" fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is" fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is" ```
This commit is contained in:
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
# freeze the stdlib into the rustpython binary
|
||||
cargoBuildFlags = [ "--features=freeze-stdlib" ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ SystemConfiguration ];
|
||||
|
||||
nativeCheckInputs = [ python3 ];
|
||||
|
||||
@@ -41,6 +41,6 @@ rustPlatform.buildRustPackage rec {
|
||||
# "_utimensat", referenced from:
|
||||
# rustpython_vm::function::builtin::IntoPyNativeFn::into_func::... in
|
||||
# rustpython-10386d81555652a7.rustpython_vm-f0b5bedfcf056d0b.rustpython_vm.7926b68e665728ca-cgu.08.rcgu.o.rcgu.o
|
||||
broken = stdenv.isDarwin && stdenv.isx86_64;
|
||||
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user