Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

openssl: Fix Windows cross compilation #68398

Merged
merged 2 commits into from
Oct 26, 2019
Merged

openssl: Fix Windows cross compilation #68398

merged 2 commits into from
Oct 26, 2019
+5 −1

Conversation

angerman
Copy link
Contributor

Replacing buildPackages.perl with perl will require perl to be built for the targetPackages, hence cross compile perl when cross compiling openssl. This hopelessly fails when cross compiling to windows.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Sep 10, 2019
@lheckemann
Copy link
Member

Is this only an issue on 19.03?

@angerman
Copy link
Contributor Author

@lheckemann yes. I believe so, as the perl change was not in 18.09 as far as I remember.

@lheckemann
Copy link
Member

Nothing to do with 18.09, but this should probably be targeted at master.

@lheckemann lheckemann added this to the 20.03 milestone Sep 12, 2019
@domenkozar domenkozar changed the title fix openssl fix openssl for cross compilation Sep 29, 2019
@bjornfor bjornfor added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Oct 6, 2019
@angerman
[win32] fix openssl

Verified

This commit was signed with the committer’s verified signature. The key has expired.
angerman Moritz Angermann
GPG key ID: A98C646D142C675F
Expired
Verified
Learn about vigilant mode
8b39330
@angerman
fix openssl

Verified

This commit was signed with the committer’s verified signature. The key has expired.
angerman Moritz Angermann
GPG key ID: A98C646D142C675F
Expired
Verified
Learn about vigilant mode
2df354f
@angerman angerman force-pushed the feature/fix-openssl branch from ee07194 to 2df354f Compare October 17, 2019 13:54
@angerman angerman changed the base branch from release-19.03 to master October 17, 2019 13:56
@angerman
Copy link
Contributor Author

@lheckemann against master now. Hope that's better. Will still need to be back ported when merged.

@ofborg ofborg bot added 6.topic: emacs Text editor 6.topic: erlang 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: haskell labels Oct 17, 2019
@ofborg ofborg bot removed 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: haskell 6.topic: lua 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: pantheon The Pantheon desktop environment 6.topic: policy discussion 6.topic: printing 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: rust 6.topic: stdenv Standard environment 6.topic: steam Steam game store/launcher (store.steampowered.com) 6.topic: vim 6.topic: xfce The Xfce Desktop Environment 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 2.status: merge conflict This PR has merge conflicts with the target branch labels Oct 17, 2019
@angerman
Copy link
Contributor Author

Meta check has not much info:

nix-env failed:

@lheckemann
Copy link
Member

lheckemann commented Oct 17, 2019 •
edited by grahamc
Loading

@ofborg eval

@grahamc
Copy link
Member

grahamc commented Oct 18, 2019

The problem was that nixpkgs can no longer evaluate in 16g of ram.

@angerman
Copy link
Contributor Author

@lheckemann can we merge this, or what's holding this off?

@Ericson2314
Copy link
Member

Could we just delete c_rehash, or replace BuildPackages.perl with an executable that always returns false?

Each of those keeps build time Perl out of the run time closure, which is a good.

@Ericson2314
Copy link
Member

I tried just skipping the substituteInPlace in place, and things seemed fine. I'll just merge this for now, and try that on staging.

@Ericson2314 Ericson2314 merged commit 6a4726d into NixOS:master Oct 26, 2019
@Ericson2314 Ericson2314 changed the title fix openssl for cross compilation openssl: Fix Windows cross compilation Nov 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edolstra edolstra

@edwtjo edwtjo

@Ericson2314 Ericson2314

@FRidh FRidh

@infinisil infinisil

@matthewbauer matthewbauer

@nbp nbp

@Profpatsch Profpatsch

@rycee rycee

@thoughtpolice thoughtpolice

@ttuegel ttuegel

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
20.03
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@angerman @lheckemann @grahamc @Ericson2314 @bjornfor