diff options
| author | Artturin <Artturin@artturin.com> | 2024-09-24 18:50:49 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2024-09-25 00:04:37 +0300 |
| commit | e0464e47880a69896f0fb1810f00e0de469f770a (patch) | |
| tree | 7890601c5347b66e5c74671b9dbbcddf1b30d1c3 /pkgs/by-name/li/lib25519/package.nix | |
| parent | aaa7fb5840f278da8010fe7466c3d952f7e536da (diff) | |
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" ```
Diffstat (limited to 'pkgs/by-name/li/lib25519/package.nix')
| -rw-r--r-- | pkgs/by-name/li/lib25519/package.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/by-name/li/lib25519/package.nix b/pkgs/by-name/li/lib25519/package.nix index 90d377948f936..68d35a796a03a 100644 --- a/pkgs/by-name/li/lib25519/package.nix +++ b/pkgs/by-name/li/lib25519/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { libcpucycles ]; - preFixup = lib.optionalString stdenv.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' install_name_tool -id "$out/lib/lib25519.1.dylib" "$out/lib/lib25519.1.dylib" for f in $out/bin/*; do install_name_tool -change "lib25519.1.dylib" "$out/lib/lib25519.1.dylib" "$f" @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # failure: crypto_pow does not handle p=q overlap - doInstallCheck = !stdenv.isDarwin; + doInstallCheck = !stdenv.hostPlatform.isDarwin; installCheckPhase = '' runHook preInstallCheck $out/bin/lib25519-test |