From 2dcefc33b696b94e0d618cf5d4c580c1770f6487 Mon Sep 17 00:00:00 2001 From: Martin Jesper Low Madsen Date: Tue, 29 Jul 2025 23:14:18 +0200 Subject: [PATCH 1/2] Copy over symbols (dSYM/) on MacOS --- crate2nix/templates/nix/crate2nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crate2nix/templates/nix/crate2nix/default.nix b/crate2nix/templates/nix/crate2nix/default.nix index 5b810733..b5724f7d 100644 --- a/crate2nix/templates/nix/crate2nix/default.nix +++ b/crate2nix/templates/nix/crate2nix/default.nix @@ -187,7 +187,7 @@ rec { # executables of the crate # we copy to prevent std::env::current_exe() to resolve to a store location for i in ${crate}/bin/*; do - cp "$i" "$testRoot" + cp -r "$i" "$testRoot" done chmod +w -R . From 1952fd9c594ec5e7079b092b883e5ce27eef7491 Mon Sep 17 00:00:00 2001 From: Martin Jesper Low Madsen Date: Wed, 30 Jul 2025 23:45:37 +0200 Subject: [PATCH 2/2] Apply template changes for sample projects --- crate2nix/Cargo.nix | 2 +- sample_projects/bin_with_git_submodule_dep/Cargo.nix | 2 +- sample_projects/codegen/Cargo.nix | 2 +- sample_projects/sub_dir_crates/Cargo.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crate2nix/Cargo.nix b/crate2nix/Cargo.nix index c848dcdd..bf0d8af3 100644 --- a/crate2nix/Cargo.nix +++ b/crate2nix/Cargo.nix @@ -3316,7 +3316,7 @@ rec { # executables of the crate # we copy to prevent std::env::current_exe() to resolve to a store location for i in ${crate}/bin/*; do - cp "$i" "$testRoot" + cp -r "$i" "$testRoot" done chmod +w -R . diff --git a/sample_projects/bin_with_git_submodule_dep/Cargo.nix b/sample_projects/bin_with_git_submodule_dep/Cargo.nix index fad04a12..bfe11562 100644 --- a/sample_projects/bin_with_git_submodule_dep/Cargo.nix +++ b/sample_projects/bin_with_git_submodule_dep/Cargo.nix @@ -1534,7 +1534,7 @@ rec { # executables of the crate # we copy to prevent std::env::current_exe() to resolve to a store location for i in ${crate}/bin/*; do - cp "$i" "$testRoot" + cp -r "$i" "$testRoot" done chmod +w -R . diff --git a/sample_projects/codegen/Cargo.nix b/sample_projects/codegen/Cargo.nix index b25e3f07..0888c598 100644 --- a/sample_projects/codegen/Cargo.nix +++ b/sample_projects/codegen/Cargo.nix @@ -709,7 +709,7 @@ rec { # executables of the crate # we copy to prevent std::env::current_exe() to resolve to a store location for i in ${crate}/bin/*; do - cp "$i" "$testRoot" + cp -r "$i" "$testRoot" done chmod +w -R . diff --git a/sample_projects/sub_dir_crates/Cargo.nix b/sample_projects/sub_dir_crates/Cargo.nix index 52aaa247..64b6de3f 100644 --- a/sample_projects/sub_dir_crates/Cargo.nix +++ b/sample_projects/sub_dir_crates/Cargo.nix @@ -318,7 +318,7 @@ rec { # executables of the crate # we copy to prevent std::env::current_exe() to resolve to a store location for i in ${crate}/bin/*; do - cp "$i" "$testRoot" + cp -r "$i" "$testRoot" done chmod +w -R .