From 56aa8ecf5d8c16e3101acfedbf12b85e75d61c5d Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 9 Nov 2024 21:57:10 -0800 Subject: [PATCH] dynein: use new Darwin SDK pattern --- pkgs/development/tools/database/dynein/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/database/dynein/default.nix b/pkgs/development/tools/database/dynein/default.nix index 167374348459..d1a31880e54f 100644 --- a/pkgs/development/tools/database/dynein/default.nix +++ b/pkgs/development/tools/database/dynein/default.nix @@ -1,10 +1,8 @@ { fetchFromGitHub , lib -, Security , openssl , pkg-config , rustPlatform -, stdenv }: rustPlatform.buildRustPackage rec { @@ -15,7 +13,7 @@ rustPlatform.buildRustPackage rec { owner = "awslabs"; repo = "dynein"; rev = "v${version}"; - sha256 = "sha256-QhasTFGOFOjzNKdQtA+eBhKy51O4dFt6vpeIAIOM2rQ="; + hash = "sha256-QhasTFGOFOjzNKdQtA+eBhKy51O4dFt6vpeIAIOM2rQ="; }; # Use system openssl. @@ -27,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + ]; preBuild = '' export OPENSSL_DIR=${lib.getDev openssl} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21342bd6eb38..5becf8ec1282 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -331,9 +331,7 @@ with pkgs; dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { }; - dynein = callPackage ../development/tools/database/dynein { - inherit (darwin.apple_sdk.frameworks) Security; - }; + dynein = callPackage ../development/tools/database/dynein { }; ebpf-verifier = callPackage ../tools/networking/ebpf-verifier { catch2 = catch2_3;