Merge pull request #58941 from cyounkins/rdesktop-darwin

rdesktop: enable darwin support without libgssglue and credssp
This commit is contained in:
Matthew Bauer 2019-06-10 21:31:53 -04:00 committed by GitHub
commit d641d2b741
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,6 @@
{stdenv, fetchurl, openssl, libX11, libgssglue, pkgconfig} : {stdenv, fetchurl, openssl, libX11, libgssglue, pkgconfig
, enableCredssp ? (!stdenv.isDarwin)
} :
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
pname = "rdesktop"; pname = "rdesktop";
@ -11,18 +13,19 @@ stdenv.mkDerivation (rec {
}; };
nativeBuildInputs = [pkgconfig]; nativeBuildInputs = [pkgconfig];
buildInputs = [openssl libX11 libgssglue]; buildInputs = [openssl libX11]
++ stdenv.lib.optional enableCredssp libgssglue;
configureFlags = [ configureFlags = [
"--with-ipv6" "--with-ipv6"
"--with-openssl=${openssl.dev}" "--with-openssl=${openssl.dev}"
"--disable-smartcard" "--disable-smartcard"
]; ] ++ stdenv.lib.optional (!enableCredssp) "--disable-credssp";
meta = { meta = {
description = "Open source client for Windows Terminal Services"; description = "Open source client for Windows Terminal Services";
homepage = http://www.rdesktop.org/; homepage = http://www.rdesktop.org/;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
}; };
}) })