diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-03-24 01:51:13 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-03-24 01:51:13 +0100 |
commit | cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4 (patch) | |
tree | 6534f00bf85774daac26bb0d592f370ee9fb59b7 /pkgs/tools/misc/starship/default.nix | |
parent | 9fd82b3e7e99678dab327332bcffec4aad01d22b (diff) | |
parent | 0bfd0187dafe3f597355e6be16b7b9a5f4b90376 (diff) | |
download | nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar.gz nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar.bz2 nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar.lz nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar.xz nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar.zst nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/misc/starship/default.nix')
-rw-r--r-- | pkgs/tools/misc/starship/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 9d1fcb897891..152db99660c8 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -1,25 +1,28 @@ -{ stdenv, fetchFromGitHub, rustPlatform +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl , libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.37.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "17jgb8fp6zarsnl1hm2y24h0xb0w2w6m61k8g3ww3r4fm8yj649v"; + sha256 = "0qp3y2wcpj1r07v1r2y42zrzkl13j0vlinjx05gfmrmapcls41gi"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + + buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; postPatch = '' substituteInPlace src/utils.rs \ --replace "/bin/echo" "echo" ''; - cargoSha256 = "01qzwk3q1f6pmyqsq5gnczdjm3157ja2zlrahw5bd5vmy929l5gq"; + cargoSha256 = "11492fv2isw2prfcgxq0wrbln1n6xdi9209cifjf25nnw2aq2csn"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { |