chore: Fix integration with latest nix bundle

holochain · Oct 17, 2024 · c8eb1ac · c8eb1ac
1 parent 64e41c6
commit c8eb1ac
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 12 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -274,32 +274,32 @@ jobs:
       - name: Bundle Lair Keystore
         run: |
           nix bundle .#holonix_lair_keystore
-          ./lair-keystore --version
-          cp ./lair-keystore deploy/lair-keystore-x86-64-linux-bundle
+          ./lair-keystore-arx --version
+          cp ./lair-keystore-arx deploy/lair-keystore-x86-64-linux-bundle
 
       - name: Bundle Holochain
         run: |
           nix bundle .#holonix_holochain
-          ./holochain --version
-          cp ./holochain deploy/holochain-x86-64-linux-bundle
+          ./holochain-arx --version
+          cp ./holochain-arx deploy/holochain-x86-64-linux-bundle
 
       - name: Bundle the `hc` CLI
         run: |
           nix bundle .#holonix_hc
-          ./hc --version
-          cp ./hc deploy/hc-x86-64-linux-bundle
+          ./hc-arx --version
+          cp ./hc-arx deploy/hc-x86-64-linux-bundle
 
       - name: Bundle the `hc-run-local-services` CLI
         run: |
           nix bundle .#holonix_hc_run_local_services
-          ./hc-run-local-services --version
-          cp ./hc-run-local-services deploy/hc-run-local-services-x86-64-linux-bundle
+          ./hc-run-local-services-arx --version
+          cp ./hc-run-local-services-arx deploy/hc-run-local-services-x86-64-linux-bundle
 
       - name: Bundle the `hcterm` CLI
         run: |
           nix bundle .#holonix_hcterm
-          ./hcterm --version
-          cp ./hcterm deploy/hcterm-x86-64-linux-bundle
+          ./hcterm-arx --version
+          cp ./hcterm-arx deploy/hcterm-x86-64-linux-bundle
 
       - name: Upload artifacts to release
         if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.upload-to-tag != '' }}

diff --git a/flake.nix b/flake.nix
@@ -113,13 +113,30 @@
             } else { });
 
             extractHolochainBin = bin: pkgs.stdenv.mkDerivation {
-              name = bin;
+              pname = bin;
+              version = inputs.holonix.packages.${localSystem}.holochain.version;
+              meta = {
+                mainProgram = bin;
+              };
               unpackPhase = "true";
               installPhase = ''
                 mkdir -p $out/bin
                 cp ${inputs.holonix.packages.${localSystem}.holochain}/bin/${bin} $out/bin
               '';
             };
+
+            lairKeystoreDrv = pkgs.stdenv.mkDerivation {
+              pname = "lair-keystore";
+              version = inputs.holonix.packages.${localSystem}.lair-keystore.version;
+              meta = {
+                mainProgram = "lair-keystore";
+              };
+              unpackPhase = "true";
+              installPhase = ''
+                mkdir -p $out
+                cp ${inputs.holonix.packages.${localSystem}.lair-keystore}/bin/lair-keystore $out
+              '';
+            };
           in
           (defineHolochainPackages { crate = "holochain"; package = "holochain"; }) //
           (defineHolochainPackages { crate = "hc"; package = "holochain_cli"; }) //
@@ -130,7 +147,7 @@
             holonix_hc = extractHolochainBin "hc";
             holonix_hc_run_local_services = extractHolochainBin "hc-run-local-services";
             holonix_hcterm = extractHolochainBin "hcterm";
-            holonix_lair_keystore = inputs.holonix.packages.${localSystem}.lair-keystore;
+            holonix_lair_keystore = lairKeystoreDrv;
           } else { })
         ;