diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-10 21:31:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-10 21:31:53 -0400 |
| commit | d641d2b7410777aa4cda884aeea50e49bffb9d32 (patch) | |
| tree | 4f5fc731bebbc8e89b2b30960ffe176f82a1b126 /pkgs | |
| parent | 62aa4f8136a26b14b1b13a755a567e8899b08cd5 (diff) | |
| parent | fcede9bbf0992bcae4e753e333e3b687af17baeb (diff) | |
| download | nixpkgs-d641d2b7410777aa4cda884aeea50e49bffb9d32.tar nixpkgs-d641d2b7410777aa4cda884aeea50e49bffb9d32.tar.gz nixpkgs-d641d2b7410777aa4cda884aeea50e49bffb9d32.tar.bz2 nixpkgs-d641d2b7410777aa4cda884aeea50e49bffb9d32.tar.lz nixpkgs-d641d2b7410777aa4cda884aeea50e49bffb9d32.tar.xz nixpkgs-d641d2b7410777aa4cda884aeea50e49bffb9d32.tar.zst nixpkgs-d641d2b7410777aa4cda884aeea50e49bffb9d32.zip | |
Merge pull request #58941 from cyounkins/rdesktop-darwin
rdesktop: enable darwin support without libgssglue and credssp
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/remote/rdesktop/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 4caa9ae63f7..9cd6083f40c 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, openssl, libX11, libgssglue, pkgconfig} : +{stdenv, fetchurl, openssl, libX11, libgssglue, pkgconfig +, enableCredssp ? (!stdenv.isDarwin) +} : stdenv.mkDerivation (rec { pname = "rdesktop"; @@ -11,18 +13,19 @@ stdenv.mkDerivation (rec { }; nativeBuildInputs = [pkgconfig]; - buildInputs = [openssl libX11 libgssglue]; + buildInputs = [openssl libX11] + ++ stdenv.lib.optional enableCredssp libgssglue; configureFlags = [ "--with-ipv6" "--with-openssl=${openssl.dev}" "--disable-smartcard" - ]; + ] ++ stdenv.lib.optional (!enableCredssp) "--disable-credssp"; meta = { description = "Open source client for Windows Terminal Services"; homepage = http://www.rdesktop.org/; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; license = stdenv.lib.licenses.gpl2; }; }) |