Support building putty for windows #44632
Merged
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
This is apparently a typo that has not been fixed. Also remove unused configureFlags.
|
@GrahamcOfBorg build pkgsCross.mingw32.putty |
|
Success on x86_64-linux (full log) Attempted: putty Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: putty Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: pkgsCross.mingw32.putty Partial log (click to expand)
|
|
Failure on x86_64-linux (full log) Attempted: pkgsCross.mingw32.putty Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Attempted: pkgsCross.mingw32.putty Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Attempted: putty Partial log (click to expand)
|
|
At which point Microsoft will hire Nix people? 😏 |
zimbatm
reviewed
Aug 8, 2018
| @@ -1,7 +1,15 @@ | |||
| { stdenv, callPackage }: | |||
| { stdenv, callPackage, lib, fetchurl }: | |||
There was a problem hiding this comment.
it looks like callPackage is not needed anymore
zimbatm
approved these changes
Aug 8, 2018
|
Haha... well putty is still free software! I want to get to the point where all of the Windows apps I use can be built from Nix expressions. |
|
CC @angerman is the bootstrapping still OK (until we can do the C++ stuff at least)? |
Ericson2314
reviewed
Aug 8, 2018
| @@ -0,0 +1,29 @@ | |||
| { newScope, crossLibcStdenv }: let | |||
There was a problem hiding this comment.
FWIW darwin's went in pkgs/top-level/darwin-packages.nix but used to be in pkgs/os-specific/darwin/default.nix. I'm not sure which I like better; I think @LnL7 made the switch?
There was a problem hiding this comment.
I prefer this way just for the shorter file paths. Also top-level is starting to get crowded.
There was a problem hiding this comment.
I moved darwin = { ... }; from all-packages to a separate file, I don't think there was a default.nix. Almost every package set points to a pkgs/top-level/<foo>-packages.nix so I think that's better for consistency's sake.
angerman
reviewed
Aug 9, 2018
| configureFlags = [ | ||
| "--enable-idl" | ||
| "--enable-secure-api" | ||
| ]; |
There was a problem hiding this comment.
I’m pretty sure we want to al least retain the secure-api. Otherwise this will result in frequent missing symbol issues.
There was a problem hiding this comment.
These weren't being used - only name & src are inherited in the derivation below. We can add them back though.
| WINBOOL IsPlatformNT() { | ||
| OSVERSIONINFOA oi = { 0 }; | ||
|
|
||
| - oi.dwOSVersionInfoSize = sizeof (osvi); |
There was a problem hiding this comment.
Why do we do this? A comment in the source would be nice. Lest the next one reading this will be puzzling over this...
There was a problem hiding this comment.
It's a bug I think. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863064.
|
@zimbatm I’ve got a nsis.nix as well that even builds the crosscompiling version (to run makensis on Linux) |
‘platforms.windows’ includes all windows platforms. Should prefer this to using assertions.
|
Success on x86_64-linux (full log) Attempted: putty Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Attempted: putty Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: putty Partial log (click to expand)
|
|
@angerman: Based on this comment, would you mind sharing/upstreaming makensis? |
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
Uses the mingw makefile in putty to build for Windows targets.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)