From 3d28eb3b7bc888f168b8ca8ea678d713fa16c103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 11 Nov 2024 15:31:54 +0100 Subject: [PATCH] zap-chip: split GUI off into zap-chip-gui --- pkgs/by-name/za/zap-chip/package.nix | 20 ++++++++++++-------- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/za/zap-chip/package.nix b/pkgs/by-name/za/zap-chip/package.nix index e2e8f2e896ae..5a358c0f32d3 100644 --- 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 index c8da48f9fac3..e6b62ab86648 100644 --- 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; };