diff options
| author | Ilan Joselevich <personal@ilanjoselevich.com> | 2024-06-10 16:19:53 +0300 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-06-11 11:27:17 +0100 |
| commit | de9a49c390e6793af604c9a05f8c7015aff32903 (patch) | |
| tree | 75dd1cbde030186c8afd7dce6a6ffaa756a54756 /pkgs/build-support/rust | |
| parent | 7aa02ac6705903e6681e6be8727d2f81dc2880f6 (diff) | |
buildRustCrate: extensions.sharedLibrary -> extensions.library
Switched to a common attribute for library file extensions: https://github.com/NixOS/nixpkgs/commit/de70971c90f3e3161e94ace851b30474228a0861 This makes buildRustCrate evaluate successfully when using pkgsCross/pkgsStatic.
Diffstat (limited to 'pkgs/build-support/rust')
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index bbb26606a6a4d..7484b3ad0290e 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -51,7 +51,7 @@ # configure & source common build functions LIB_RUSTC_OPTS="${libRustcOpts}" BIN_RUSTC_OPTS="${binRustcOpts}" - LIB_EXT="${stdenv.hostPlatform.extensions.sharedLibrary or ""}" + LIB_EXT="${stdenv.hostPlatform.extensions.library}" LIB_PATH="${libPath}" LIB_NAME="${libName}" diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 4a7fd114829ad..9ceda041b6653 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -49,7 +49,7 @@ let filename = if lib.any (x: x == "lib" || x == "rlib") dep.crateType then "${dep.metadata}.rlib" - else "${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}"; + else "${dep.metadata}${stdenv.hostPlatform.extensions.library}"; in " --extern ${opts}${name}=${dep.lib}/lib/lib${extern}-${filename}" ) diff --git a/pkgs/build-support/rust/build-rust-crate/install-crate.nix b/pkgs/build-support/rust/build-rust-crate/install-crate.nix index f4a4dcdb0d945..7c7c102833d85 100644 --- a/pkgs/build-support/rust/build-rust-crate/install-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/install-crate.nix @@ -41,7 +41,7 @@ if !buildTests then '' fi if [ -e target/lib ]; then find target/lib/ -type f \! -name '*.rlib' \ - -a \! -name '*${stdenv.hostPlatform.extensions.sharedLibrary}' \ + -a \! -name '*${stdenv.hostPlatform.extensions.library}' \ -a \! -name '*.d' \ -executable \ -print0 | xargs --no-run-if-empty --null install --target $out/tests; diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index 1ecef4c8e3270..522eedfede7f2 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -479,7 +479,7 @@ let # `-undefined dynamic_lookup` as otherwise the compilation fails. $CC -shared \ ${lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup"} \ - -o $out/lib/${name}${stdenv.hostPlatform.extensions.sharedLibrary} ${src} + -o $out/lib/${name}${stdenv.hostPlatform.extensions.library} ${src} ''; b = compile "libb" '' #include <stdio.h> |