Unverified Commit 02df07b4 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

kiro-cli: fix overlapping mainProgram with kiro package (#491115)

parents 63e19f6a 0905f4e5

pkgs/by-name/ki/kiro-cli/package.nix

+10 −15
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
  stdenv,

  fetchurl,

  autoPatchelfHook,

  makeBinaryWrapper,

  undmg,

  versionCheckHook,

  xz,
@@ -42,10 +41,8 @@ stdenv.mkDerivation (finalAttrs: { 


  strictDeps = true;



  nativeBuildInputs = [

    makeBinaryWrapper

  ]

  ++ lib.optionals stdenv.hostPlatform.isLinux [

  nativeBuildInputs =

    lib.optionals stdenv.hostPlatform.isLinux [

      autoPatchelfHook

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [
@@ -68,16 +65,14 @@ stdenv.mkDerivation (finalAttrs: { 
    runHook preInstall

  ''

  + lib.optionalString stdenv.hostPlatform.isLinux ''

    install -Dm755 bin/kiro-cli $out/bin/.kiro-wrapped

    install -Dm755 bin/kiro-cli -t $out/bin

    install -Dm755 bin/kiro-cli-chat $out/bin/kiro-cli-chat

    install -Dm755 bin/kiro-cli-term $out/bin/kiro-cli-term

    makeBinaryWrapper $out/bin/.kiro-wrapped $out/bin/kiro \

      --prefix PATH : $out/bin

  ''

  + lib.optionalString stdenv.hostPlatform.isDarwin ''

    mkdir -p $out/bin $out/Applications

    cp -r "../Kiro CLI.app" "$out/Applications/"

    ln -s "$out/Applications/Kiro CLI.app/Contents/MacOS/kiro-cli" $out/bin/kiro

    ln -s "$out/Applications/Kiro CLI.app/Contents/MacOS/kiro-cli" $out/bin/kiro-cli

    for bin in kiro-cli-chat kiro-cli-term; do

      if [[ -e "$out/Applications/Kiro CLI.app/Contents/MacOS/$bin" ]]; then

        ln -s "$out/Applications/Kiro CLI.app/Contents/MacOS/$bin" "$out/bin/$bin"
@@ -96,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { 
    license = lib.licenses.unfree;

    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];

    maintainers = [ lib.maintainers.jamesward ];

    mainProgram = "kiro";

    mainProgram = "kiro-cli";

    platforms = [

      "x86_64-linux"

      "aarch64-linux"