diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-05-09 13:38:32 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-11-09 10:02:24 +0100 |
commit | e3e57b8f1885bf1dc4787728479711f46a4171cc (patch) | |
tree | e83bec78d2ee16e3453cfb39b45c03f759cb06c8 /pkgs/development/libraries/libimagequant/default.nix | |
parent | fecd99b105c644b1b61abfec6c203b304269e1e2 (diff) | |
download | nixlib-e3e57b8f1885bf1dc4787728479711f46a4171cc.tar nixlib-e3e57b8f1885bf1dc4787728479711f46a4171cc.tar.gz nixlib-e3e57b8f1885bf1dc4787728479711f46a4171cc.tar.bz2 nixlib-e3e57b8f1885bf1dc4787728479711f46a4171cc.tar.lz nixlib-e3e57b8f1885bf1dc4787728479711f46a4171cc.tar.xz nixlib-e3e57b8f1885bf1dc4787728479711f46a4171cc.tar.zst nixlib-e3e57b8f1885bf1dc4787728479711f46a4171cc.zip |
lib.systems: elaborate Rust metadata
We need this stuff to be available in lib so make-derivation.nix can access it to construct the Meson cross file. This has a couple of other advantages: - It makes Rust less special. Now figuring out what Rust calls a platform is the same as figuring out what Linux or QEMU call it. - We can unify the schema used to define Rust targets, and the schema used to access those values later. Just like you can set "config" or "system" in a platform definition, and then access those same keys on the elaborated platform, you can now set "rustcTarget" in your crossSystem, and then access "stdenv.hostPlatform.rustcTarget" in your code. "rustcTarget", "rustcTargetSpec", "cargoShortTarget", and "cargoEnvVarTarget" have the "rustc" and "cargo" prefixes because these are not exposed to code by the compiler, and are not standardized. The arch/os/etc. variables are all named to match the forms in the Rust target spec JSON. The new rust.target-family only takes a list, since we don't need to worry about backwards compatibility when that name is used. The old APIs are all still functional with no warning for now, so that it's possible for external code to use a single API on both 23.05 and 23.11. We can introduce the warnings once 23.05 is EOL, and make them hard errors when 23.11 is EOL.
Diffstat (limited to 'pkgs/development/libraries/libimagequant/default.nix')
-rw-r--r-- | pkgs/development/libraries/libimagequant/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 0ac6e89e23ea..f60a1c7cab7a 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -1,8 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl, rust, rustPlatform, cargo-c, python3 }: -let - rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; -in rustPlatform.buildRustPackage rec { pname = "libimagequant"; version = "4.2.2"; @@ -26,13 +23,13 @@ rustPlatform.buildRustPackage rec { postBuild = '' pushd imagequant-sys - ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} popd ''; postInstall = '' pushd imagequant-sys - ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} popd ''; |