From f4839bfc43864ded5ba47ba1adcae67e3a9e456c Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Tue, 11 May 2021 00:35:08 +0300 Subject: [PATCH 1/2] nym: fix build on darwin --- pkgs/applications/networking/nym/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix index 9251862ba6e..1dc41f3af97 100644 --- a/pkgs/applications/networking/nym/default.nix +++ b/pkgs/applications/networking/nym/default.nix @@ -1,8 +1,11 @@ -{ lib +{ stdenv +, lib , rustPlatform , fetchFromGitHub , pkg-config , openssl +, Security +, libiconv }: rustPlatform.buildRustPackage rec { @@ -20,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; patches = [ ./ignore-networking-tests.patch ]; checkType = "debug"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24fbb63792b..13073bf6a9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7146,7 +7146,9 @@ in nylon = callPackage ../tools/networking/nylon { }; - nym = callPackage ../applications/networking/nym { }; + nym = callPackage ../applications/networking/nym { + inherit (darwin.apple_sdk.frameworks) Security; + }; nzbget = callPackage ../tools/networking/nzbget { }; From 0d3bc3db3e5c1a72487eed9fa2b95559e874787c Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Tue, 11 May 2021 02:11:49 +0300 Subject: [PATCH 2/2] nym: all platforms --- pkgs/applications/networking/nym/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix index 1dc41f3af97..b7bffcd694e 100644 --- a/pkgs/applications/networking/nym/default.nix +++ b/pkgs/applications/networking/nym/default.nix @@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://nymtech.net"; license = licenses.asl20; maintainers = [ maintainers.ehmry ]; - platforms = with platforms; intersectLists (linux ++ darwin) (concatLists [ x86 x86_64 aarch64 arm ]); + platforms = platforms.all; }; }