zap-chip: split GUI off into zap-chip-gui (NixOS#354249)

haruki7049 · Nov 11, 2024 · 0f1c508 · 0f1c508
2 parents dd11284 + 2cc4cb9
commit 0f1c508
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/pkgs/by-name/za/zap-chip/package.nix b/pkgs/by-name/za/zap-chip/package.nix
@@ -4,6 +4,7 @@
   electron_31,
   fetchFromGitHub,
   writers,
+  withGui ? false,
 }:
 
 let
@@ -50,25 +51,28 @@ buildNpmPackage rec {
       cat .version.json
     '';
 
-  postBuild = ''
+  postBuild = lib.optionalString withGui ''
     npm exec electron-builder -- \
       --dir \
       -c.electronDist=${electron.dist} \
       -c.electronVersion=${electron.version}
   '';
 
-  postInstall = ''
-    # this file is also used at runtime
-    install -m644 .version.json $out/lib/node_modules/zap/
-    # home-assistant chip-* python packages need the executable under the name zap-cli
-    ln -s $out/bin/zap $out/bin/zap-cli
-  '';
+  postInstall =
+    ''
+      # this file is also used at runtime
+      install -m644 .version.json $out/lib/node_modules/zap/
+    ''
+    + lib.optionalString (!withGui) ''
+      # home-assistant chip-* python packages need the executable under the name zap-cli
+      mv $out/bin/zap $out/bin/zap-cli
+    '';
 
   meta = {
     description = "Generic generation engine and user interface for applications and libraries based on Zigbee Cluster Library (ZCL)";
     changelog = "https://github.com/project-chip/zap/releases/tag/v${version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ symphorien ];
-    mainProgram = "zap-cli";
+    mainProgram = "zap" + lib.optionalString (!withGui) "-cli";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -19094,6 +19094,8 @@ with pkgs;
 
   yandex-browser-corporate = yandex-browser.override { edition = "corporate"; };
 
+  zap-chip-gui = zap-chip.override { withGui = true; };
+
   myEnvFun = callPackage ../misc/my-env {
     inherit (stdenv) mkDerivation;
   };

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -5829,7 +5829,7 @@ self: super: with self; {
 
   home-assistant-bluetooth = callPackage ../development/python-modules/home-assistant-bluetooth { };
 
-  home-assistant-chip-wheels = callPackage ../development/python-modules/home-assistant-chip-wheels { };
+  home-assistant-chip-wheels = toPythonModule (callPackage ../development/python-modules/home-assistant-chip-wheels { });
 
   home-assistant-chip-clusters = callPackage ../development/python-modules/home-assistant-chip-clusters { };