Unverified Commit 0f1c5085 authored by Guillaume Girol's avatar Guillaume Girol Committed by GitHub
Browse files

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

parents dd112841 2cc4cb93

pkgs/by-name/za/zap-chip/package.nix

+12 −8
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  electron_31,

  fetchFromGitHub,

  writers,

  withGui ? false,

}:



let
@@ -50,18 +51,21 @@ buildNpmPackage rec { 
      cat .version.json

    '';



  postBuild = ''

  postBuild = lib.optionalString withGui ''

    npm exec electron-builder -- \

      --dir \

      -c.electronDist=${electron.dist} \

      -c.electronVersion=${electron.version}

  '';



  postInstall = ''

  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

    ln -s $out/bin/zap $out/bin/zap-cli

      mv $out/bin/zap $out/bin/zap-cli

    '';



  meta = {
@@ -69,6 +73,6 @@ buildNpmPackage rec { 
    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";

  };

}

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -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;















  };

























pkgs/top-level/python-packages.nix



+1
−1






























Original line number
Diff line number
Diff line








@@ -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 { };