diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2024-01-09 09:44:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-09 09:44:34 +0100 |
| commit | 99d3b3d7bf2a21e688fab66276666630635f901a (patch) | |
| tree | a36de9558d2b38b92681ae6db7ffde754f1810df /pkgs/development/compilers | |
| parent | 715b28a8970a3beb652e2041a30da108a1aea884 (diff) | |
| parent | c324705cc3ac228eeee1d72f4ee4ea46fc5e1283 (diff) | |
Merge pull request #279486 from r-burns/exec-format-cleanup
treewide: simplify exec format conditionals
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/rust/cargo.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index ff0ecf45fd235..1377cfad6c6c1 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -98,8 +98,7 @@ rustPlatform.buildRustPackage.override { # Disable check phase as there are failures (4 tests fail) doCheck = false; - doInstallCheck = !stdenv.hostPlatform.isStatic && - stdenv.hostPlatform.parsed.kernel.execFormat == lib.systems.parse.execFormats.elf; + doInstallCheck = !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isElf; installCheckPhase = '' runHook preInstallCheck readelf -a $out/bin/.cargo-wrapped | grep -F 'Shared library: [libcurl.so' |