git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #122493 from onsails/nym

nym: fix build on darwin

commit8366be903c9017e10165a21a29eedb068daf3071 authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateMon 10 May 2021, 23:49 (6 years ago) parentee4520e0d3bc3d
2 files changed+9−4
pkgs/applications/networking/nym/default.nix+6−3 pkgs/top-level/all-packages.nix+3−1
pkgs/applications/networking/nym/default.nix+6−3
@@ -1,8 +1,11 @@
1−{ lib
1+{ stdenv
2+, lib
23, rustPlatform
34, fetchFromGitHub
45, pkg-config
56, openssl
7+, Security
8+, libiconv
69}:
710
811rustPlatform.buildRustPackage rec {
@@ -20,7 +23,7 @@ rustPlatform.buildRustPackage rec {
2023
2124 nativeBuildInputs = [ pkg-config ];
2225
23− buildInputs = [ openssl ];
26+ buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ];
2427
2528 patches = [ ./ignore-networking-tests.patch ];
2629 checkType = "debug";
@@ -36,6 +39,6 @@ rustPlatform.buildRustPackage rec {
3639 homepage = "https://nymtech.net";
3740 license = licenses.asl20;
3841 maintainers = [ maintainers.ehmry ];
39− platforms = with platforms; intersectLists (linux ++ darwin) (concatLists [ x86 x86_64 aarch64 arm ]);
42+ platforms = platforms.all;
4043 };
4144}
pkgs/top-level/all-packages.nix+3−1
@@ -7146,7 +7146,9 @@ in
71467146
71477147 nylon = callPackage ../tools/networking/nylon { };
71487148
7149− nym = callPackage ../applications/networking/nym { };
7149+ nym = callPackage ../applications/networking/nym {
7150+ inherit (darwin.apple_sdk.frameworks) Security;
7151+ };
71507152
71517153 nzbget = callPackage ../tools/networking/nzbget { };
71527154