diff options
| author | Payas Relekar <relekarpayas@gmail.com> | 2021-03-21 09:05:48 +0530 |
|---|---|---|
| committer | Payas Relekar <relekarpayas@gmail.com> | 2021-03-23 07:56:48 +0530 |
| commit | e46f1a6f65667d8cd89c59ba66eaadc18a838ac1 (patch) | |
| tree | 6565c7e3cb4d5ca1ad81dd6d46fc1679495c5bda /pkgs/tools/networking/xh/default.nix | |
| parent | 27f1e2b7b12f8813cb32919c660cd11319cd8822 (diff) | |
| download | nixpkgs-e46f1a6f65667d8cd89c59ba66eaadc18a838ac1.tar nixpkgs-e46f1a6f65667d8cd89c59ba66eaadc18a838ac1.tar.gz nixpkgs-e46f1a6f65667d8cd89c59ba66eaadc18a838ac1.tar.bz2 nixpkgs-e46f1a6f65667d8cd89c59ba66eaadc18a838ac1.tar.lz nixpkgs-e46f1a6f65667d8cd89c59ba66eaadc18a838ac1.tar.xz nixpkgs-e46f1a6f65667d8cd89c59ba66eaadc18a838ac1.tar.zst nixpkgs-e46f1a6f65667d8cd89c59ba66eaadc18a838ac1.zip | |
xh: 0.7.0 -> 0.9.1
Diffstat (limited to 'pkgs/tools/networking/xh/default.nix')
| -rw-r--r-- | pkgs/tools/networking/xh/default.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index 1d1736cd816..33f3e394d71 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -1,22 +1,31 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }: +{ stdenv, lib, openssl, pkg-config, rustPlatform, fetchFromGitHub, Security +, libiconv }: rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.7.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "0b7q0xbfbrhvpnxbm9bd1ncdza9k2kcmcir3qhqzb2pgsb5b5njx"; + sha256 = "pRVlcaPfuO7IMH2p0AQfVrCIXCRyF37WIirOJQkcAJE="; }; - cargoSha256 = "02fgqys9qf0jzs2n230pyj151v6xbm6wm2rd9qm5gsib6zaq7gfa"; + cargoSha256 = "dXo1+QvCW3CWN2OhsqGh2Q1xet6cmi2xVy1Xk7s1YR8="; - buildInputs = lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = if stdenv.isDarwin then [ Security libiconv ] else [ openssl ]; + + # Get openssl-sys to use pkg-config + OPENSSL_NO_VENDOR = 1; checkFlagsArray = [ "--skip=basic_options" ]; + # Nix build happens in sandbox without internet connectivity + # disable tests as some of them require internet due to nature of application + doCheck = false; doInstallCheck = true; postInstallCheck = '' $out/bin/xh --help > /dev/null |