Unverified Commit b84dd9e4 authored by figsoda's avatar figsoda Committed by GitHub
Browse files

Merge pull request #217375 from figsoda/xh

xh: 0.17.0 -> 0.18.0, add figsoda as a maintainer
parents 80d984e0 c04117d4
Loading
Loading
Loading
Loading
+12 −14
Original line number Diff line number Diff line
{ stdenv
, lib
, pkg-config
{ lib
, rustPlatform
, fetchFromGitHub
, installShellFiles
, pkg-config
, withNativeTls ? true
, stdenv
, Security
, libiconv
, openssl }:
, openssl
}:

rustPlatform.buildRustPackage rec {
  pname = "xh";
  version = "0.17.0";
  version = "0.18.0";

  src = fetchFromGitHub {
    owner = "ducaale";
    repo = "xh";
    rev = "v${version}";
    sha256 = "sha256-4rFtbCfx6QFdp62FPjOYAhSWM03g3rXsF4pD22+EhcA=";
    sha256 = "sha256-2qZ+FGc8Y8HLJaQluVv036NG77lvaqsc3I5cmkD+r/M=";
  };

  cargoSha256 = "sha256-av/F1FHMd0o9NvwA2Q9mqSd89ZEqmUaVxC+JmSwEHhI=";
  cargoSha256 = "sha256-0lPEZ8Th3PAw6AEnb+ciKMhi5wysFCvYwiHd9/o8VVc=";

  buildFeatures = lib.optional withNativeTls "native-tls";

  nativeBuildInputs = [ installShellFiles pkg-config ];

  buildInputs = lib.optionals withNativeTls
    (if stdenv.isDarwin then [ Security libiconv ] else [ openssl ]);
    (if stdenv.isDarwin then [ Security ] else [ openssl ]);

  # Get openssl-sys to use pkg-config
  OPENSSL_NO_VENDOR = 1;

  postInstall = ''
    installShellCompletion --cmd xh \
      --bash completions/xh.bash \
      --fish completions/xh.fish \
    installShellCompletion \
      completions/xh.{bash,fish} \
      --zsh completions/_xh

    installManPage doc/xh.1
@@ -43,7 +42,6 @@ rustPlatform.buildRustPackage rec {

    install -m444 -Dt $out/share/doc/xh README.md CHANGELOG.md

    # https://github.com/ducaale/xh#xh-and-xhs
    ln -s $out/bin/xh $out/bin/xhs
  '';

@@ -61,6 +59,6 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://github.com/ducaale/xh";
    changelog = "https://github.com/ducaale/xh/blob/v${version}/CHANGELOG.md";
    license = licenses.mit;
    maintainers = with maintainers; [ payas ];
    maintainers = with maintainers; [ figsoda payas ];
  };
}