Commit ea21ca27 authored by Guy Chronister's avatar Guy Chronister
Browse files

_1password-cli: inline mainProgram in install and checks 

- Replace `${pname}` reference in error message with explicit
  `"1password-cli"` for clarity.
- Inline `op` instead of `${mainProgram}` in:
  - `installPhase` binary installation
  - shell completion installation
  - `versionCheckProgram`
- Ensures consistency, avoids unnecessary indirection, and
  makes the derivation easier to read and maintain.
parent 900624bd

pkgs/by-name/_1/_1password-cli/package.nix

+7 −7
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ stdenv.mkDerivation { 
    if (builtins.elem system platforms) then

      sources.${system}

    else

      throw "Source for ${pname} is not available for ${system}";

      throw "Source for 1password-cli is not available for ${system}";



  nativeBuildInputs = [

    installShellFiles
@@ -63,23 +63,23 @@ stdenv.mkDerivation { 


  installPhase = ''

    runHook preInstall

    install -D ${mainProgram} $out/bin/${mainProgram}

    install -D op $out/bin/op

    runHook postInstall

  '';



  postInstall = ''

    HOME=$TMPDIR

    installShellCompletion --cmd ${mainProgram} \

      --bash <($out/bin/${mainProgram} completion bash) \

      --fish <($out/bin/${mainProgram} completion fish) \

      --zsh <($out/bin/${mainProgram} completion zsh)

    installShellCompletion --cmd op \

      --bash <($out/bin/op completion bash) \

      --fish <($out/bin/op completion fish) \

      --zsh <($out/bin/op completion zsh)

  '';



  dontStrip = stdenv.hostPlatform.isDarwin;



  doInstallCheck = true;



  versionCheckProgram = "${builtins.placeholder "out"}/bin/${mainProgram}";

  versionCheckProgram = "${builtins.placeholder "out"}/bin/op";

  versionCheckProgramArg = "--version";



  passthru = {