From c7114ec51a454c0b1d4c6bb552580ea6af58610a Mon Sep 17 00:00:00 2001 From: Sander Date: Sun, 28 May 2023 16:16:41 +0000 Subject: [PATCH 1/2] meilisearch: fix build on x86_64-darwin --- pkgs/servers/search/meilisearch/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 9870d743af1bec..2fe4d5414b6539 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -2,9 +2,9 @@ , lib , rustPlatform , fetchFromGitHub -, Security , DiskArbitration , Foundation +, Security , nixosTests , nix-update-script }: @@ -40,9 +40,9 @@ rustPlatform.buildRustPackage { buildNoDefaultFeatures = true; buildInputs = lib.optionals stdenv.isDarwin [ - Security DiskArbitration Foundation + Security ]; passthru = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index feac7c4a2d942e..9cad757ba47562 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9371,7 +9371,7 @@ with pkgs; }; meilisearch = callPackage ../servers/search/meilisearch { - inherit (darwin.apple_sdk.frameworks) Security DiskArbitration Foundation; + inherit (darwin.apple_sdk_11_0.frameworks) DiskArbitration Foundation Security; }; memtester = callPackage ../tools/system/memtester { }; From 82b12bc8613b910f2bb6a37acb70a54514f4b3f2 Mon Sep 17 00:00:00 2001 From: Sander Date: Sun, 28 May 2023 21:32:51 +0400 Subject: [PATCH 2/2] meilisearch: remove unused darwin frameworks --- pkgs/servers/search/meilisearch/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 2fe4d5414b6539..95363391f1140e 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -2,8 +2,6 @@ , lib , rustPlatform , fetchFromGitHub -, DiskArbitration -, Foundation , Security , nixosTests , nix-update-script @@ -40,8 +38,6 @@ rustPlatform.buildRustPackage { buildNoDefaultFeatures = true; buildInputs = lib.optionals stdenv.isDarwin [ - DiskArbitration - Foundation Security ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cad757ba47562..ea6a94b1efb18c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9371,7 +9371,7 @@ with pkgs; }; meilisearch = callPackage ../servers/search/meilisearch { - inherit (darwin.apple_sdk_11_0.frameworks) DiskArbitration Foundation Security; + inherit (darwin.apple_sdk_11_0.frameworks) Security; }; memtester = callPackage ../tools/system/memtester { };