rdesktop: enable darwin support without libgssglue and credssp #58941
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GrahamcOfBorg
added
6.topic: darwin
matthewbauer
reviewed
Apr 3, 2019
|
|
||
| configureFlags = [ | ||
| "--with-ipv6" | ||
| "--with-openssl=${openssl.dev}" | ||
| "--disable-smartcard" | ||
| ]; | ||
| ] ++ (if stdenv.isDarwin then ["--disable-credssp"] else []); |
There was a problem hiding this comment.
Can you make this an argument? Something like enableCredssp ? !stdenv.isDarwin.
LnL7
reviewed
Apr 17, 2019
| @@ -11,18 +11,18 @@ stdenv.mkDerivation (rec { | |||
| }; | |||
|
|
|||
| nativeBuildInputs = [pkgconfig]; | |||
| buildInputs = [openssl libX11 libgssglue]; | |||
| buildInputs = [openssl libX11] ++ (if stdenv.isDarwin then [] else [libgssglue]); | |||
There was a problem hiding this comment.
Suggested change
| buildInputs = [openssl libX11] ++ (if stdenv.isDarwin then [] else [libgssglue]); | |
| buildInputs = [openssl libX11] | |
| ++ stdenv.lib.optional stdenv.isDarwin libgssglue]; |
cyounkins
force-pushed
the
rdesktop-darwin
branch
from
93ea0d3
to
c735071
Compare
cyounkins
force-pushed
the
rdesktop-darwin
branch
from
c735071
to
fcede9b
Compare
|
I think I finally got this. Would be good to verify the linux build. |
|
Can someone confirm |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Enables building of
rdesktopon macOS by disabling CredSSP, releasing the dependency onlibgssgluewhich fails to build on macOS.Macports and Homebrew are doing this:
macports/macports-ports@b192e83
https://github.com/Homebrew/homebrew-core/blob/master/Formula/rdesktop.rb
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)