From 00ca496abc541449c83f52368d96129767158439 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 7 Apr 2025 16:32:29 -0500 Subject: [PATCH] hiksink: Migrate to by-name format nix script with nixfmt Attempt to fix rebuild in migration with Darwin. Remove stdenv for rust environment --- .../hi/hiksink/package.nix} | 18 ++++++------------ pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 6 insertions(+), 16 deletions(-) rename pkgs/{tools/misc/hiksink/default.nix => by-name/hi/hiksink/package.nix} (71%) diff --git a/pkgs/tools/misc/hiksink/default.nix b/pkgs/by-name/hi/hiksink/package.nix similarity index 71% rename from pkgs/tools/misc/hiksink/default.nix rename to pkgs/by-name/hi/hiksink/package.nix index fb2fd6df3fe5..f9a361179d69 100644 --- a/pkgs/tools/misc/hiksink/default.nix +++ b/pkgs/by-name/hi/hiksink/package.nix @@ -1,10 +1,8 @@ { lib, - stdenv, fetchFromGitHub, rustPlatform, pkg-config, - Security, openssl, }: @@ -26,19 +24,15 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = - [ - openssl - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - ]; + buildInputs = [ + openssl + ]; - meta = with lib; { + meta = { description = "Tool to convert Hikvision camera events to MQTT"; homepage = "https://github.com/CornerBit/HikSink"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "hik_sink"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f113b9da842e..d2eb7a8d40cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2496,10 +2496,6 @@ with pkgs; buildGoModule = buildGo123Module; }; - hiksink = callPackage ../tools/misc/hiksink { - inherit (darwin.apple_sdk.frameworks) Security; - }; - hocr-tools = with python3Packages; toPythonApplication hocr-tools; hopper = qt5.callPackage ../development/tools/analysis/hopper { };