Fix build dna and happ on mac

holochain-open-dev · Apr 24, 2024 · e04d1eb · e04d1eb
1 parent c971b93
commit e04d1eb
Show file tree

Hide file tree

Showing 7 changed files with 4,633 additions and 26,021 deletions.
diff --git a/nix/dna.nix b/nix/dna.nix
@@ -11,9 +11,8 @@
 
 let
 	zomeSrcs = builtins.attrValues zomes;
-
-  # Recurse over the zomes, and add the correct bundled zome package by name
-
+
+    # Recurse over the zomes, and add the correct bundled zome package by name
 	manifest = (callPackage ./import-yaml.nix {}) dnaManifest;
 	zomeToBundled = zome: zome // {
 		bundled = zomes.${zome.name};
@@ -31,19 +30,40 @@ let
 	dnaManifestJson = writeText "dna.json" (builtins.toJSON manifest');
 	dnaManifestYaml = runCommandLocal "json-to-yaml" {} ''
 		${json2yaml}/bin/json2yaml ${dnaManifestJson} $out
-	'';
-	debug = runCommandLocal manifest.name {
-		srcs = builtins.map (zome: zome.meta.debug) zomeSrcs;
-		meta = {
-			inherit debug;
-			holochainPackageType = "dna";
+	'';    # Recurse over the zomes, and add the correct bundled zome package by name
+
+	# Debug package
+	debug = let
+		manifest = (callPackage ./import-yaml.nix {}) dnaManifest;
+		zomeToBundled = zome: zome // {
+			bundled = zomes.${zome.name}.meta.debug;
 		};
-	} ''
-	  mkdir workdir
-		cp ${dnaManifestYaml} workdir/dna.yaml
-		${holochain.packages.holochain}/bin/hc dna pack workdir
-		mv workdir/${manifest.name}.dna $out
-	'';
+		coordinatorZomes = builtins.map zomeToBundled manifest.coordinator.zomes;
+		integrityZomes = builtins.map zomeToBundled manifest.integrity.zomes;
+
+		manifest' = manifest // {
+			coordinator.zomes = coordinatorZomes;
+			integrity = manifest.integrity // {
+				zomes = integrityZomes;
+			};
+		};
+
+		dnaManifestJson = writeText "dna.json" (builtins.toJSON manifest');
+		dnaManifestYaml = runCommandLocal "json-to-yaml" {} ''
+			${json2yaml}/bin/json2yaml ${dnaManifestJson} $out
+		'';
+	in
+		runCommandLocal manifest.name {
+			srcs = builtins.map (zome: zome.meta.debug) zomeSrcs;
+			meta = {
+				holochainPackageType = "dna";
+			};
+		} ''
+			mkdir workdir
+			cp ${dnaManifestYaml} workdir/dna.yaml
+			${holochain.packages.holochain}/bin/hc dna pack workdir
+			mv workdir/${manifest.name}.dna $out
+		'';
 in
   runCommandLocal manifest.name {
 		srcs = zomeSrcs;