nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 11:53:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

openconnect: pass darwin framework individually

Browse Source 
suggested by @SuperSandro2000
This commit is contained in:
Matt McHenry 2020-12-09 20:53:04 -05:00
parent ab1213627a
commit c2e076a767
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/networking/openconnect/default.nix
View File

@ -9,7 +9,7 @@
, stoken , stoken
, zlib , zlib
, fetchgit , fetchgit
, darwin , PCSC
, head ? false , head ? false
, fetchFromGitLab , fetchFromGitLab
, autoreconfHook , autoreconfHook
@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ openssl gnutls gmp libxml2 stoken zlib ] buildInputs = [ openssl gnutls gmp libxml2 stoken zlib ]
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.PCSC; ++ lib.optional stdenv.isDarwin PCSC;
nativeBuildInputs = [ pkg-config ] nativeBuildInputs = [ pkg-config ]
++ lib.optional head autoreconfHook; ++ lib.optional head autoreconfHook;

3
pkgs/top-level/all-packages.nix
View File

@ -9468,14 +9468,17 @@ in
openconnect = openconnect_gnutls; openconnect = openconnect_gnutls;
openconnect_openssl = callPackage ../tools/networking/openconnect { openconnect_openssl = callPackage ../tools/networking/openconnect {
inherit (darwin.apple_sdk.frameworks) PCSC;
gnutls = null; gnutls = null;
}; };
openconnect_gnutls = callPackage ../tools/networking/openconnect { openconnect_gnutls = callPackage ../tools/networking/openconnect {
inherit (darwin.apple_sdk.frameworks) PCSC;
openssl = null; openssl = null;
}; };
openconnect_head = callPackage ../tools/networking/openconnect { openconnect_head = callPackage ../tools/networking/openconnect {
inherit (darwin.apple_sdk.frameworks) PCSC;
head = true; head = true;
openssl = null; openssl = null;
}; };