Merge pull request #372 from pnmadelaine/fix-cross-compiling

Ericson2314 · web-flow · commit a308f2656639 · 2025-02-11T11:04:34.000-05:00
Fix build-dependencies resolution when cross-compiling
diff --git a/crate2nix/Cargo.nix b/crate2nix/Cargo.nix
@@ -449,7 +449,7 @@ rec {
           {
             name = "libc";
             packageId = "libc";
-            target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "aarch64-linux-android");
+            target = { target, features }: (target.name == "aarch64-linux-android");
           }
           {
             name = "libc";
@@ -2691,12 +2691,12 @@ rec {
           {
             name = "winapi-i686-pc-windows-gnu";
             packageId = "winapi-i686-pc-windows-gnu";
-            target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "i686-pc-windows-gnu");
+            target = { target, features }: (target.name == "i686-pc-windows-gnu");
           }
           {
             name = "winapi-x86_64-pc-windows-gnu";
             packageId = "winapi-x86_64-pc-windows-gnu";
-            target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "x86_64-pc-windows-gnu");
+            target = { target, features }: (target.name == "x86_64-pc-windows-gnu");
           }
         ];
         features = {
@@ -3001,7 +3001,7 @@ rec {
           {
             name = "windows_aarch64_gnullvm";
             packageId = "windows_aarch64_gnullvm";
-            target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "aarch64-pc-windows-gnullvm");
+            target = { target, features }: (target.name == "aarch64-pc-windows-gnullvm");
           }
           {
             name = "windows_aarch64_msvc";
@@ -3016,7 +3016,7 @@ rec {
           {
             name = "windows_i686_gnullvm";
             packageId = "windows_i686_gnullvm";
-            target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "i686-pc-windows-gnullvm");
+            target = { target, features }: (target.name == "i686-pc-windows-gnullvm");
           }
           {
             name = "windows_i686_msvc";
@@ -3031,7 +3031,7 @@ rec {
           {
             name = "windows_x86_64_gnullvm";
             packageId = "windows_x86_64_gnullvm";
-            target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "x86_64-pc-windows-gnullvm");
+            target = { target, features }: (target.name == "x86_64-pc-windows-gnullvm");
           }
           {
             name = "windows_x86_64_msvc";
@@ -3154,6 +3154,8 @@ rec {
     This corresponds roughly to what buildRustCrate is setting.
   */
   makeDefaultTarget = platform: {
+    name = platform.rust.rustcTarget;
+
     unix = platform.isUnix;
     windows = platform.isWindows;
     fuchsia = true;
@@ -3468,7 +3470,7 @@ rec {
                   packageId: value: buildByPackageIdForPkgsImpl self pkgs packageId
                 )
                 crateConfigs;
-              target = makeTarget stdenv.hostPlatform;
+              target = makeTarget pkgs.stdenv.hostPlatform;
               build = mkBuiltByPackageIdByPkgs pkgs.buildPackages;
             };
           in
diff --git a/crate2nix/src/render.rs b/crate2nix/src/render.rs
@@ -184,10 +184,7 @@ fn cfg_to_nix_expr_filter(
                 })?;
                 Ok(tera::Value::String(cfg_to_nix_expr(&expr)))
             } else {
-                let condition = format!(
-                    "(stdenv.hostPlatform.rust.rustcTarget == {})",
-                    escape_nix_string(key)
-                );
+                let condition = format!("(target.name == {})", escape_nix_string(key));
                 Ok(tera::Value::String(condition))
             }
         }
diff --git a/crate2nix/templates/Cargo.nix.tera b/crate2nix/templates/Cargo.nix.tera
@@ -220,7 +220,7 @@ rec {
             usesDefaultFeatures = false;
             {%- endif -%}
             {%- if dependency.target %}
-            target = { target, features }: {{dependency.target | cfg_to_nix_expr | safe }};
+            target = { target, features }: {{dependency.target | cfg_to_nix_expr | safe}};
             {%- endif %}
             {%- if dependency.features %}
             features = [ {% for feature in dependency.features %}{{feature}} {% endfor %}];
@@ -246,7 +246,7 @@ rec {
             usesDefaultFeatures = false;
             {%- endif -%}
             {%- if dependency.target %}
-            target = {target, features}: {{dependency.target | cfg_to_nix_expr | safe }};
+            target = { target, features }: {{dependency.target | cfg_to_nix_expr | safe}};
             {%- endif %}
             {%- if dependency.features %}
             features = [ {% for feature in dependency.features %}{{feature}} {% endfor %}];
@@ -271,7 +271,7 @@ rec {
             usesDefaultFeatures = false;
             {%- endif -%}
             {%- if dependency.target %}
-            target = {target, features}: {{dependency.target | cfg_to_nix_expr | safe }};
+            target = { target, features }: {{dependency.target | cfg_to_nix_expr | safe}};
             {%- endif %}
             {%- if dependency.features %}
             features = [ {% for feature in dependency.features %}{{feature}} {% endfor %}];
diff --git a/crate2nix/templates/nix/crate2nix/default.nix b/crate2nix/templates/nix/crate2nix/default.nix
@@ -25,6 +25,8 @@ rec {
     This corresponds roughly to what buildRustCrate is setting.
   */
   makeDefaultTarget = platform: {
+    name = platform.rust.rustcTarget;
+
     unix = platform.isUnix;
     windows = platform.isWindows;
     fuchsia = true;
@@ -339,7 +341,7 @@ rec {
                   packageId: value: buildByPackageIdForPkgsImpl self pkgs packageId
                 )
                 crateConfigs;
-              target = makeTarget stdenv.hostPlatform;
+              target = makeTarget pkgs.stdenv.hostPlatform;
               build = mkBuiltByPackageIdByPkgs pkgs.buildPackages;
             };
           in
diff --git a/sample_projects/bin_with_git_submodule_dep/Cargo.nix b/sample_projects/bin_with_git_submodule_dep/Cargo.nix
@@ -1256,7 +1256,7 @@ rec {
           {
             name = "windows_aarch64_gnullvm";
             packageId = "windows_aarch64_gnullvm";
-            target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "aarch64-pc-windows-gnullvm");
+            target = { target, features }: (target.name == "aarch64-pc-windows-gnullvm");
           }
           {
             name = "windows_aarch64_msvc";
@@ -1281,7 +1281,7 @@ rec {
           {
             name = "windows_x86_64_gnullvm";
             packageId = "windows_x86_64_gnullvm";
-            target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "x86_64-pc-windows-gnullvm");
+            target = { target, features }: (target.name == "x86_64-pc-windows-gnullvm");
           }
           {
             name = "windows_x86_64_msvc";
@@ -1372,6 +1372,8 @@ rec {
     This corresponds roughly to what buildRustCrate is setting.
   */
   makeDefaultTarget = platform: {
+    name = platform.rust.rustcTarget;
+
     unix = platform.isUnix;
     windows = platform.isWindows;
     fuchsia = true;
@@ -1686,7 +1688,7 @@ rec {
                   packageId: value: buildByPackageIdForPkgsImpl self pkgs packageId
                 )
                 crateConfigs;
-              target = makeTarget stdenv.hostPlatform;
+              target = makeTarget pkgs.stdenv.hostPlatform;
               build = mkBuiltByPackageIdByPkgs pkgs.buildPackages;
             };
           in
diff --git a/sample_projects/codegen/Cargo.nix b/sample_projects/codegen/Cargo.nix
@@ -491,12 +491,12 @@ rec {
           {
             name = "winapi-i686-pc-windows-gnu";
             packageId = "winapi-i686-pc-windows-gnu";
-            target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "i686-pc-windows-gnu");
+            target = { target, features }: (target.name == "i686-pc-windows-gnu");
           }
           {
             name = "winapi-x86_64-pc-windows-gnu";
             packageId = "winapi-x86_64-pc-windows-gnu";
-            target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "x86_64-pc-windows-gnu");
+            target = { target, features }: (target.name == "x86_64-pc-windows-gnu");
           }
         ];
         features = {
@@ -547,6 +547,8 @@ rec {
     This corresponds roughly to what buildRustCrate is setting.
   */
   makeDefaultTarget = platform: {
+    name = platform.rust.rustcTarget;
+
     unix = platform.isUnix;
     windows = platform.isWindows;
     fuchsia = true;
@@ -861,7 +863,7 @@ rec {
                   packageId: value: buildByPackageIdForPkgsImpl self pkgs packageId
                 )
                 crateConfigs;
-              target = makeTarget stdenv.hostPlatform;
+              target = makeTarget pkgs.stdenv.hostPlatform;
               build = mkBuiltByPackageIdByPkgs pkgs.buildPackages;
             };
           in
diff --git a/sample_projects/cross_compile_build_dependencies/Cargo.lock b/sample_projects/cross_compile_build_dependencies/Cargo.lock
diff --git a/sample_projects/cross_compile_build_dependencies/Cargo.toml b/sample_projects/cross_compile_build_dependencies/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "cross_compile_build_dependencies"
+version = "1.0.0"
+edition = "2021"
+
+[build-dependencies]
+alice.path = "./alice"
diff --git a/sample_projects/cross_compile_build_dependencies/alice/Cargo.toml b/sample_projects/cross_compile_build_dependencies/alice/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "alice"
+version = "1.0.0"
+edition = "2021"
+
+[target.'cfg(unix)'.dependencies]
+bob.path = "./bob"
diff --git a/sample_projects/cross_compile_build_dependencies/alice/bob/Cargo.toml b/sample_projects/cross_compile_build_dependencies/alice/bob/Cargo.toml
@@ -0,0 +1,4 @@
+[package]
+name = "bob"
+version = "1.0.0"
+edition = "2021"
diff --git a/sample_projects/cross_compile_build_dependencies/alice/bob/src/lib.rs b/sample_projects/cross_compile_build_dependencies/alice/bob/src/lib.rs
diff --git a/sample_projects/cross_compile_build_dependencies/alice/src/lib.rs b/sample_projects/cross_compile_build_dependencies/alice/src/lib.rs
@@ -0,0 +1,2 @@
+#[cfg(unix)]
+pub use bob;
diff --git a/sample_projects/cross_compile_build_dependencies/default.nix b/sample_projects/cross_compile_build_dependencies/default.nix
@@ -0,0 +1,4 @@
+{ generatedCargoNix
+, pkgs ? import ../../nix/nixpkgs.nix { crossSystem.config = "wasm32-unknown-none"; }
+}:
+(pkgs.callPackage generatedCargoNix { }).rootCrate.build
diff --git a/sample_projects/cross_compile_build_dependencies/src/main.rs b/sample_projects/cross_compile_build_dependencies/src/main.rs
@@ -0,0 +1 @@
+fn main() {}
diff --git a/sample_projects/sub_dir_crates/Cargo.nix b/sample_projects/sub_dir_crates/Cargo.nix
@@ -156,6 +156,8 @@ rec {
     This corresponds roughly to what buildRustCrate is setting.
   */
   makeDefaultTarget = platform: {
+    name = platform.rust.rustcTarget;
+
     unix = platform.isUnix;
     windows = platform.isWindows;
     fuchsia = true;
@@ -470,7 +472,7 @@ rec {
                   packageId: value: buildByPackageIdForPkgsImpl self pkgs packageId
                 )
                 crateConfigs;
-              target = makeTarget stdenv.hostPlatform;
+              target = makeTarget pkgs.stdenv.hostPlatform;
               build = mkBuiltByPackageIdByPkgs pkgs.buildPackages;
             };
           in
diff --git a/tests.nix b/tests.nix
@@ -377,6 +377,12 @@ let
       ];
     }
 
+    {
+      name = "cross_compile_build_dependencies";
+      src = ./sample_projects/cross_compile_build_dependencies;
+      customBuild = "sample_projects/cross_compile_build_dependencies/default.nix";
+    }
+
     #
     # Prefetch tests
     #

Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ rec {`
`449`	`449`	`{`
`450`	`450`	`name = "libc";`
`451`	`451`	`packageId = "libc";`
`452`		`- target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "aarch64-linux-android");`
	`452`	`+ target = { target, features }: (target.name == "aarch64-linux-android");`
`453`	`453`	`}`
`454`	`454`	`{`
`455`	`455`	`name = "libc";`
`@@ -2691,12 +2691,12 @@ rec {`
`2691`	`2691`	`{`
`2692`	`2692`	`name = "winapi-i686-pc-windows-gnu";`
`2693`	`2693`	`packageId = "winapi-i686-pc-windows-gnu";`
`2694`		`- target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "i686-pc-windows-gnu");`
	`2694`	`+ target = { target, features }: (target.name == "i686-pc-windows-gnu");`
`2695`	`2695`	`}`
`2696`	`2696`	`{`
`2697`	`2697`	`name = "winapi-x86_64-pc-windows-gnu";`
`2698`	`2698`	`packageId = "winapi-x86_64-pc-windows-gnu";`
`2699`		`- target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "x86_64-pc-windows-gnu");`
	`2699`	`+ target = { target, features }: (target.name == "x86_64-pc-windows-gnu");`
`2700`	`2700`	`}`
`2701`	`2701`	`];`
`2702`	`2702`	`features = {`
`@@ -3001,7 +3001,7 @@ rec {`
`3001`	`3001`	`{`
`3002`	`3002`	`name = "windows_aarch64_gnullvm";`
`3003`	`3003`	`packageId = "windows_aarch64_gnullvm";`
`3004`		`- target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "aarch64-pc-windows-gnullvm");`
	`3004`	`+ target = { target, features }: (target.name == "aarch64-pc-windows-gnullvm");`
`3005`	`3005`	`}`
`3006`	`3006`	`{`
`3007`	`3007`	`name = "windows_aarch64_msvc";`
`@@ -3016,7 +3016,7 @@ rec {`
`3016`	`3016`	`{`
`3017`	`3017`	`name = "windows_i686_gnullvm";`
`3018`	`3018`	`packageId = "windows_i686_gnullvm";`
`3019`		`- target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "i686-pc-windows-gnullvm");`
	`3019`	`+ target = { target, features }: (target.name == "i686-pc-windows-gnullvm");`
`3020`	`3020`	`}`
`3021`	`3021`	`{`
`3022`	`3022`	`name = "windows_i686_msvc";`
`@@ -3031,7 +3031,7 @@ rec {`
`3031`	`3031`	`{`
`3032`	`3032`	`name = "windows_x86_64_gnullvm";`
`3033`	`3033`	`packageId = "windows_x86_64_gnullvm";`
`3034`		`- target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "x86_64-pc-windows-gnullvm");`
	`3034`	`+ target = { target, features }: (target.name == "x86_64-pc-windows-gnullvm");`
`3035`	`3035`	`}`
`3036`	`3036`	`{`
`3037`	`3037`	`name = "windows_x86_64_msvc";`
`@@ -3154,6 +3154,8 @@ rec {`
`3154`	`3154`	`This corresponds roughly to what buildRustCrate is setting.`
`3155`	`3155`	`*/`
`3156`	`3156`	`makeDefaultTarget = platform: {`
	`3157`	`+ name = platform.rust.rustcTarget;`
	`3158`	`+`
`3157`	`3159`	`unix = platform.isUnix;`
`3158`	`3160`	`windows = platform.isWindows;`
`3159`	`3161`	`fuchsia = true;`
`@@ -3468,7 +3470,7 @@ rec {`
`3468`	`3470`	`packageId: value: buildByPackageIdForPkgsImpl self pkgs packageId`
`3469`	`3471`	`)`
`3470`	`3472`	`crateConfigs;`
`3471`		`- target = makeTarget stdenv.hostPlatform;`
	`3473`	`+ target = makeTarget pkgs.stdenv.hostPlatform;`
`3472`	`3474`	`build = mkBuiltByPackageIdByPkgs pkgs.buildPackages;`
`3473`	`3475`	`};`
`3474`	`3476`	`in`
Original file line number	Diff line number	Diff line change
`@@ -184,10 +184,7 @@ fn cfg_to_nix_expr_filter(`
`184`	`184`	`})?;`
`185`	`185`	`Ok(tera::Value::String(cfg_to_nix_expr(&expr)))`
`186`	`186`	`} else {`
`187`		`- let condition = format!(`
`188`		`- "(stdenv.hostPlatform.rust.rustcTarget == {})",`
`189`		`- escape_nix_string(key)`
`190`		`- );`
	`187`	`+ let condition = format!("(target.name == {})", escape_nix_string(key));`
`191`	`188`	`Ok(tera::Value::String(condition))`
`192`	`189`	`}`
`193`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1256,7 +1256,7 @@ rec {`
`1256`	`1256`	`{`
`1257`	`1257`	`name = "windows_aarch64_gnullvm";`
`1258`	`1258`	`packageId = "windows_aarch64_gnullvm";`
`1259`		`- target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "aarch64-pc-windows-gnullvm");`
	`1259`	`+ target = { target, features }: (target.name == "aarch64-pc-windows-gnullvm");`
`1260`	`1260`	`}`
`1261`	`1261`	`{`
`1262`	`1262`	`name = "windows_aarch64_msvc";`
`@@ -1281,7 +1281,7 @@ rec {`
`1281`	`1281`	`{`
`1282`	`1282`	`name = "windows_x86_64_gnullvm";`
`1283`	`1283`	`packageId = "windows_x86_64_gnullvm";`
`1284`		`- target = { target, features }: (stdenv.hostPlatform.rust.rustcTarget == "x86_64-pc-windows-gnullvm");`
	`1284`	`+ target = { target, features }: (target.name == "x86_64-pc-windows-gnullvm");`
`1285`	`1285`	`}`
`1286`	`1286`	`{`
`1287`	`1287`	`name = "windows_x86_64_msvc";`
`@@ -1372,6 +1372,8 @@ rec {`
`1372`	`1372`	`This corresponds roughly to what buildRustCrate is setting.`
`1373`	`1373`	`*/`
`1374`	`1374`	`makeDefaultTarget = platform: {`
	`1375`	`+ name = platform.rust.rustcTarget;`
	`1376`	`+`
`1375`	`1377`	`unix = platform.isUnix;`
`1376`	`1378`	`windows = platform.isWindows;`
`1377`	`1379`	`fuchsia = true;`
`@@ -1686,7 +1688,7 @@ rec {`
`1686`	`1688`	`packageId: value: buildByPackageIdForPkgsImpl self pkgs packageId`
`1687`	`1689`	`)`
`1688`	`1690`	`crateConfigs;`
`1689`		`- target = makeTarget stdenv.hostPlatform;`
	`1691`	`+ target = makeTarget pkgs.stdenv.hostPlatform;`
`1690`	`1692`	`build = mkBuiltByPackageIdByPkgs pkgs.buildPackages;`
`1691`	`1693`	`};`
`1692`	`1694`	`in`