Merge pull request #122493 from onsails/nym

nym: fix build on darwin
This commit is contained in:
Dmitry Kalinkin 2021-05-10 23:49:42 -04:00 committed by GitHub
commit 8366be903c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions

View File

@ -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";
@ -36,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;
};
}

View File

@ -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 { };