From 593fe790e7c699ce44be641877be8433d1adffbe Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 22 Dec 2022 21:06:40 +0100 Subject: stork: unbreak on x86_64-darwin --- pkgs/applications/misc/stork/default.nix | 7 ++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 196e35042284d..6b23e2d492c51 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -4,7 +4,7 @@ , openssl , pkg-config , stdenv -, darwin +, Security }: rustPlatform.buildRustPackage rec { @@ -23,15 +23,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ++ lib.optionals stdenv.isDarwin [ 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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1593b7e74a34..204e12298e134 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37233,7 +37233,9 @@ with pkgs; sticky = callPackage ../applications/misc/sticky { }; - stork = callPackage ../applications/misc/stork { }; + stork = darwin.apple_sdk_11_0.callPackage ../applications/misc/stork { + inherit (darwin.apple_sdk_11_0.frameworks) Security; + }; superd = callPackage ../misc/superd { }; -- cgit 1.4.1