about summary refs log tree commit diff
path: root/pkgs/development/compilers/rust/cargo.nix
diff options
context:
space:
mode:
authorK900 <me@0upti.me>2024-01-09 13:03:34 +0300
committerK900 <me@0upti.me>2024-01-09 13:03:34 +0300
commitbff9ee8862ff6df90bddaeca8369b2e1d332ce4e (patch)
tree7871f44f20037afe7fc5cd1d600f51739e3147a7 /pkgs/development/compilers/rust/cargo.nix
parentc999add543505bfad4d2c7be9583010225d2527e (diff)
parent1e4909f24b8cb50442c769624ae3d3a4629635f2 (diff)
downloadnixlib-bff9ee8862ff6df90bddaeca8369b2e1d332ce4e.tar
nixlib-bff9ee8862ff6df90bddaeca8369b2e1d332ce4e.tar.gz
nixlib-bff9ee8862ff6df90bddaeca8369b2e1d332ce4e.tar.bz2
nixlib-bff9ee8862ff6df90bddaeca8369b2e1d332ce4e.tar.lz
nixlib-bff9ee8862ff6df90bddaeca8369b2e1d332ce4e.tar.xz
nixlib-bff9ee8862ff6df90bddaeca8369b2e1d332ce4e.tar.zst
nixlib-bff9ee8862ff6df90bddaeca8369b2e1d332ce4e.zip
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/development/compilers/rust/cargo.nix')
-rw-r--r--pkgs/development/compilers/rust/cargo.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index ff0ecf45fd23..1377cfad6c6c 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'