Merge pull request #88468 from lilyball/ffsend

ffsend: don't require openssl on darwin
This commit is contained in:
Mario Rodas 2020-05-20 19:49:53 -05:00 committed by GitHub
commit 9caecc8bc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -28,9 +28,9 @@ buildRustPackage rec {
cargoSha256 = "0svmbay9waaq9fpc8lg1nys6l35xsjvkri5v1frlgxida5dzghpq";
nativeBuildInputs = [ cmake pkgconfig installShellFiles ];
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ])
;
buildInputs =
if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ])
else [ openssl ];
preBuild = stdenv.lib.optionalString (x11Support && usesX11) (
if preferXsel && xsel != null then ''