summary refs log tree commit diff
diff options
context:
space:
mode:
authorArtturin <Artturin@artturin.com>2023-09-21 04:09:34 +0300
committerArtturin <Artturin@artturin.com>2023-09-21 04:13:45 +0300
commit8a77757b7ebfcf0958951a096f005ab919d6567f (patch)
treeaf72a695413e83af7a5eda0ba384a031c99035e9
parentfd6901755debe65abf8102a61dbfb44dd09fa1dc (diff)
downloadnixpkgs-8a77757b7ebfcf0958951a096f005ab919d6567f.tar
nixpkgs-8a77757b7ebfcf0958951a096f005ab919d6567f.tar.gz
nixpkgs-8a77757b7ebfcf0958951a096f005ab919d6567f.tar.bz2
nixpkgs-8a77757b7ebfcf0958951a096f005ab919d6567f.tar.lz
nixpkgs-8a77757b7ebfcf0958951a096f005ab919d6567f.tar.xz
nixpkgs-8a77757b7ebfcf0958951a096f005ab919d6567f.tar.zst
nixpkgs-8a77757b7ebfcf0958951a096f005ab919d6567f.zip
writers.writeCBin: fix binary name when cross-compiling
`$name` contains cross-compilation info `bin/wrapped-argv0-aarch64-unknown-linux-gnu`

name should not be set directly.
-rw-r--r--pkgs/build-support/trivial-builders/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index c4f2cfd754c..8b8732af065 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -379,21 +379,21 @@ rec {
     };
 
   # Create a C binary
-  writeCBin = name: code:
-    runCommandCC name
+  writeCBin = pname: code:
+    runCommandCC pname
     {
-      inherit name code;
+      inherit pname code;
       executable = true;
       passAsFile = ["code"];
       # Pointless to do this on a remote machine.
       preferLocalBuild = true;
       allowSubstitutes = false;
       meta = {
-        mainProgram = name;
+        mainProgram = pname;
       };
     }
     ''
-      n=$out/bin/$name
+      n=$out/bin/${pname}
       mkdir -p "$(dirname "$n")"
       mv "$codePath" code.c
       $CC -x c code.c -o "$n"