Merge pull request #199794 from tjni/fix-humility-hash

fixes https://github.com/NixOS/nixpkgs/pull/192842
This commit is contained in:
Sandro
2022-11-10 19:39:27 +01:00
committed by GitHub
2 changed files with 10 additions and 4 deletions
@@ -1,10 +1,12 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, libusb
, libusb1
, libftdi
, cargo-readme
, pkg-config
, AppKit
}:
rustPlatform.buildRustPackage rec {
@@ -12,7 +14,9 @@ rustPlatform.buildRustPackage rec {
version = "unstable-2022-09-15";
nativeBuildInputs = [ pkg-config cargo-readme ];
buildInputs = [ libusb libftdi ];
buildInputs = [ libusb1 libftdi ] ++ lib.optionals stdenv.isDarwin [
AppKit
];
src = fetchFromGitHub {
owner = "oxidecomputer";
@@ -21,7 +25,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-yW7QcxTWbL2YsV2bvfhbqQ2nawlPQbYxBfIGCWo28GY=";
};
cargoSha256 = "sha256-UhO8VO3OCfYc8Xq/P+l9f5ZrhOD/TBzSClAeAXLJLlc=";
cargoSha256 = "sha256-IurLI0ZQNpmiYwfcMZuxi7FWtSX+Ts7GYWFwUfD+Ji8=";
meta = with lib; {
description = "Debugger for Hubris";
+3 -1
View File
@@ -25016,7 +25016,9 @@ with pkgs;
htop-vim = callPackage ../tools/system/htop/htop-vim.nix { };
humility = callPackage ../development/tools/rust/humility {};
humility = callPackage ../development/tools/rust/humility {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
btop = callPackage ../tools/system/btop {
stdenv = gcc11Stdenv;