From 157b6703ea5710491deed981bb85d0d5404db7f8 Mon Sep 17 00:00:00 2001 From: Chua Hou Date: Sat, 19 Feb 2022 23:35:27 +0000 Subject: [PATCH] stork: 1.3.0 -> 1.4.0 * stork: 1.3.0 -> 1.4.0 (#157416) * stork: add Security framework and mark broken for x64 darwin build - The Security framework is needed to build on Darwin. - It currently fails on x86_64-darwin because the SDK is too old. - For more details, see #157416. --- pkgs/applications/misc/stork/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 7ff59d9baa30..11face45145b 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -3,29 +3,35 @@ , fetchFromGitHub , openssl , pkg-config +, stdenv +, darwin }: rustPlatform.buildRustPackage rec { pname = "stork"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "jameslittle230"; repo = "stork"; rev = "v${version}"; - sha256 = "sha256-or8PDEj97ChZq6r3WlwETYbU6EvoEuh8HfTyBIbbO8M="; + sha256 = "sha256-9fylJcUuModemkBRnXeFfB1b+CD9IvTxW+CnlqaUb60="; }; - cargoSha256 = "sha256-UpIPbY2beO1H0YR9kV1SkG6C3qcO4x2acfgqI3x5jiM="; + cargoSha256 = "sha256-j7OXl66xuTuP6hWJs+xHrwtaBGAYt02OESCN6FH3KX0="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = "Impossibly fast web search, made for static sites"; homepage = "https://github.com/jameslittle230/stork"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ chuahou ]; + # TODO: Remove once nixpkgs uses macOS SDK 10.14+ for x86_64-darwin + # Undefined symbols for architecture x86_64: "_SecTrustEvaluateWithError" + broken = stdenv.isDarwin && stdenv.isx86_64; }; }