Fix cc-sign-native in nix expression

IntersectMBO · Sep 4, 2024 · 3064322 · 3064322
1 parent d01cfdb
commit 3064322
Showing 1 changed file with 20 additions and 19 deletions.
diff --git a/nix/outputs.nix b/nix/outputs.nix
@@ -3,6 +3,22 @@
 let
 
   project = repoRoot.nix.project;
+  cc-sign-native = pkgs.runCommand "cc-sign"
+    {
+      nativeBuildInputs = [
+        pkgs.macdylibbundler
+        pkgs.darwin.autoSignDarwinBinariesHook
+      ];
+    } ''
+    mkdir -p $out/bin
+    cp ${project.packages.cc-sign}/bin/cc-sign $out/bin/cc-sign
+    chmod 755 $out/bin/cc-sign
+    dylibbundler -b --no-codesign \
+      -x $out/bin/cc-sign \
+      -d $out/bin \
+      -p '@executable_path'
+    signDarwinBinariesInAllOutputs
+  '';
 
 in
 
@@ -11,23 +27,8 @@ in
   (lib.optionalAttrs pkgs.stdenv.isLinux {
     hydraJobs.musl64 = project.cross.musl64.hydraJobs;
   })
-  (lib.optionalAttrs pkgs.stdenv.isDarwin (rec {
-    packages.cc-sign-native = pkgs.runCommand "cc-sign"
-      {
-        nativeBuildInputs = [
-          pkgs.macdylibbundler
-          pkgs.darwin.autoSignDarwinBinariesHook
-        ];
-      } ''
-      mkdir -p $out/bin
-      cp ${project.packages.cc-sign}/bin/cc-sign $out/bin/cc-sign
-      chmod 755 $out/bin/cc-sign
-      dylibbundler -b --no-codesign \
-        -x $out/bin/cc-sign \
-        -d $out/bin \
-        -p '@executable_path'
-      signDarwinBinariesInAllOutputs
-    '';
-    hydraJobs.cc-sign-native = cc-sign-native;
-  }))
+  (lib.optionalAttrs pkgs.stdenv.isDarwin {
+    packages = { inherit cc-sign-native; };
+    hydraJobs = { inherit cc-sign-native; };
+  })
 ]