Openssl mingw fix #108170

brano543 · 2021-01-01T21:28:23Z

Motivation for this change

Corrected cross-compilation to Windows for OpenSSL 1.1.

Things done

brano543 · 2021-01-01T21:49:30Z

Hello community,

I see that my fix is breaking this line https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix#L395. I am not that advanced in Nix. Could you please help on correcting that part?

SuperSandro2000 · 2021-01-01T22:05:28Z

Hello community,

I see that my fix is breaking this line https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix#L395. I am not that advanced in Nix. Could you please help on correcting that part?

You removed openssl from inputs and the function there still calls it with openssl. I think you need to remove openssl there but I am not sure if your PR is correct otherwise.

brano543 · 2021-01-01T22:27:23Z

Hello community,
I see that my fix is breaking this line https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix#L395. I am not that advanced in Nix. Could you please help on correcting that part?

You removed openssl from inputs and the function there still calls it with openssl. I think you need to remove openssl there but I am not sure if your PR is correct otherwise.

Thank you for the explanation. I will need to correct the commit so that it can take both coreutils and perl as input parameters while still using buildPackages for mingw build.

brano543 · 2021-01-01T23:53:07Z

Succcessfuly tested builds:

native
lib.systems.examples.mingwW64
lib.systems.examples.armv7a-android-prebuilt
aarch64-android-prebuilt

brano543 · 2021-01-02T10:50:07Z

Result of nixpkgs-review pr 108170 1

brano543 · 2021-01-02T10:58:18Z

@SuperSandro2000: I am having trouble to add @peti as reviewer. There is no option for me to add any user as reviewer. Could you please help me?

flokli · 2021-01-02T23:38:08Z

I tried building this locally, but there seems to be a patch gone missing:

❯ nix-build -A pkgs.pkgsCross.mingwW64.openssl_1_1
these derivations will be built:
  /nix/store/a12yra4nkkgcmigsq9h6qnx8ydi74ad9-stdenv-linux.drv
  /nix/store/3iw31akfh9h4455dhs6snmdz2k2l827f-mingw-w64-6.0.0-x86_64-w64-mingw32-headers.drv
  /nix/store/43l438jsccs6v3z31jjyzdyqyq8a4j9j-x86_64-w64-mingw32-binutils-2.34.drv
  /nix/store/jq4xbnxrip310cbj2hxazh96xmlf2p5q-x86_64-w64-mingw32-binutils-wrapper-2.34.drv
  /nix/store/k4spm1bmj8cwxg3hnz2yil3hncw95ghh-x86_64-w64-mingw32-stage-static-gcc-debug-10.2.0.drv
  /nix/store/wc8g0a8n3di1ybn898bmf956k30y94gm-x86_64-w64-mingw32-stage-static-gcc-debug-wrapper-10.2.0.drv
  /nix/store/gq1dix827kik7m81vqflz09wv3m4m42m-stdenv-linux.drv
  /nix/store/sym3i6lb0gk3w8zdh97p574vkb76gcis-mingw-w64-6.0.0-x86_64-w64-mingw32.drv
  /nix/store/q1n84n2g1h7vg5pxzw9bjb0mwk5zgwn8-x86_64-w64-mingw32-binutils-wrapper-2.34.drv
  /nix/store/0n81lj0ypj4afr6ciml7jh6h2hb5gkv8-x86_64-w64-mingw32-stage-static-gcc-debug-wrapper-10.2.0.drv
  /nix/store/cf9i2f70dwipk6mx3gscgv7drnswbkhk-stdenv-linux.drv
  /nix/store/1hmw26bphrsh5xw17hykxz10abif5k3y-mcfgthreads-git-x86_64-w64-mingw32.drv
  /nix/store/v6ahf53lbv7zgxdxh6lwwnif4i7934rc-9000-gcc-10-branch-Added-mcf-thread-model-support-from-mcfgthread.patch.drv
  /nix/store/m4xaqmy5g4xd71dbxqmp4qz37q7a894q-x86_64-w64-mingw32-stage-final-gcc-debug-10.2.0.drv
  /nix/store/sh4dw58v41f2nzi6s0ylwj60i2lglx8z-x86_64-w64-mingw32-stage-final-gcc-debug-wrapper-10.2.0.drv
  /nix/store/n5jsh4xymd8qrmciinqkxxkpq9jsvgvg-stdenv-linux.drv
  /nix/store/pr4g43p07pcj49ldcqimnwnnbc6q0bb9-openssl-1.1.1i-x86_64-w64-mingw32.drv
building '/nix/store/v6ahf53lbv7zgxdxh6lwwnif4i7934rc-9000-gcc-10-branch-Added-mcf-thread-model-support-from-mcfgthread.patch.drv'...
building '/nix/store/43l438jsccs6v3z31jjyzdyqyq8a4j9j-x86_64-w64-mingw32-binutils-2.34.drv'...
building '/nix/store/a12yra4nkkgcmigsq9h6qnx8ydi74ad9-stdenv-linux.drv'...
building '/nix/store/3iw31akfh9h4455dhs6snmdz2k2l827f-mingw-w64-6.0.0-x86_64-w64-mingw32-headers.drv'...
unpacking sources
unpacking source archive /nix/store/3n4i0m7s953lh0si9j9zl10i2xy8cmka-mingw-w64-v6.0.0.tar.bz2
unpacking sources
unpacking source archive /nix/store/pp6qa6cd4scy76dinpgic0g6vfz6g472-binutils-2.34.tar.bz2

trying https://raw.githubusercontent.com/lhmouse/MINGW-packages/740f233da00c4fb5bcc225b2e29768824bcecc58/mingw-w64-gcc-git/9000-gcc-10-branch-Added-mcf-thread-model-support-from-mcfgthread.patch
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
curl: (22) The requested URL returned error: 404 Not Found
error: cannot download 9000-gcc-10-branch-Added-mcf-thread-model-support-from-mcfgthread.patch from any mirror
builder for '/nix/store/v6ahf53lbv7zgxdxh6lwwnif4i7934rc-9000-gcc-10-branch-Added-mcf-thread-model-support-from-mcfgthread.patch.drv' failed with exit code 1
cannot build derivation '/nix/store/m4xaqmy5g4xd71dbxqmp4qz37q7a894q-x86_64-w64-mingw32-stage-final-gcc-debug-10.2.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/sh4dw58v41f2nzi6s0ylwj60i2lglx8z-x86_64-w64-mingw32-stage-final-gcc-debug-wrapper-10.2.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/n5jsh4xymd8qrmciinqkxxkpq9jsvgvg-stdenv-linux.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/pr4g43p07pcj49ldcqimnwnnbc6q0bb9-openssl-1.1.1i-x86_64-w64-mingw32.drv': 1 dependencies couldn't be built
error: build of '/nix/store/pr4g43p07pcj49ldcqimnwnnbc6q0bb9-openssl-1.1.1i-x86_64-w64-mingw32.drv' failed

Also, it's probably easier to not nixpkgs-fmt openssl/default.nix, given this is a minor edit.

brano543 · 2021-01-03T09:49:26Z

Hello Florian,

I am unable to reproduce the issue you are having. I have tested my changes against latest nixpkgs-unstable branch.

 "nixpkgs": {
        "branch": "nixpkgs-unstable",
        "description": "Nix Packages collection",
        "homepage": "",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "2080afd039999a58d60596d04cefb32ef5fcc2a2",
        "sha256": "0i677swvj8fxfwg3jibd0xl33rn0rq0adnniim8jnp384whnh8ry",
        "type": "tarball",
        "url": "https://github.com/NixOS/nixpkgs/archive/2080afd039999a58d60596d04cefb32ef5fcc2a2.tar.gz",
        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
    }

SuperSandro2000 · 2021-01-10T13:34:44Z

I am unable to reproduce the issue you are having. I have tested my changes against latest nixpkgs-unstable branch.

You have the patch locally but we do not so we can't fetch it.

brano543 · 2021-01-10T15:31:05Z

I am unable to reproduce the issue you are having. I have tested my changes against latest nixpkgs-unstable branch.

You have the patch locally but we do not so we can't fetch it.

I am confused a little. I wanted to contribute to solving #82924 for Windows. The only change I did was to openssl default.nix file. I didn't add any other files locally.

What do I need to do then so you guys can merge the fix?

pkgs/development/libraries/openssl/default.nix

peti

Please don't gratitously reformat the file. The cosmetic changes in the diff obscure the real changes.

flokli · 2021-01-10T19:34:35Z

I am unable to reproduce the issue you are having. I have tested my changes against latest nixpkgs-unstable branch.

You have the patch locally but we do not so we can't fetch it.

I am confused a little. I wanted to contribute to solving #82924 for Windows. The only change I did was to openssl default.nix file. I didn't add any other files locally.

What do I need to do then so you guys can merge the fix?

I wasn't able to build this, because the cross-gcc to mingw referred to a non-existent patch file (https://raw.githubusercontent.com/lhmouse/MINGW-packages/740f233da00c4fb5bcc225b2e29768824bcecc58/mingw-w64-gcc-git/9000-gcc-10-branch-Added-mcf-thread-model-support-from-mcfgthread.patch), which seems to have disappeared from the internet.

This has been solved in the meantime, by inlining the patches (see #107978).

Please rebase this PR to master, and as requested by @peti, don't reformat unrelated things.

brano543 · 2021-01-10T20:20:04Z

I am unable to reproduce the issue you are having. I have tested my changes against latest nixpkgs-unstable branch.

You have the patch locally but we do not so we can't fetch it.

I am confused a little. I wanted to contribute to solving #82924 for Windows. The only change I did was to openssl default.nix file. I didn't add any other files locally.
What do I need to do then so you guys can merge the fix?

I wasn't able to build this, because the cross-gcc to mingw referred to a non-existent patch file (https://raw.githubusercontent.com/lhmouse/MINGW-packages/740f233da00c4fb5bcc225b2e29768824bcecc58/mingw-w64-gcc-git/9000-gcc-10-branch-Added-mcf-thread-model-support-from-mcfgthread.patch), which seems to have disappeared from the internet.

This has been solved in the meantime, by inlining the patches (see #107978).

Please rebase this PR to master, and as requested by @peti, don't reformat unrelated things.

I have cleaned up the commit and resolved the merge conflict with commit f52263c

Ericson2314 · 2021-01-10T20:25:49Z

Where is this config thing installed, `dev?

Mic92

Adding buildPackages as argument to common is actually not required.

pkgs/development/libraries/openssl/default.nix

brano543 · 2021-01-11T19:14:48Z

Adding buildPackages as argument to common is actually not required.

I have added the changes.

Ericson2314 · 2021-01-11T19:26:13Z

If config goes in $dev this is fine with me, but please add a comment saying so.

brano543 · 2021-01-12T10:06:04Z

Adding buildPackages as argument to common is actually not required.

It seems that removing these makes tests unhappy.

attribute 'coreutils' missing, at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/ofborg-evaluator-3/pkgs/development/libraries/openssl/default.nix:37:60

Mic92 · 2021-01-12T14:15:46Z

But how did it work before? It's the same buildPackages that is used, no?

Radvendii · 2021-04-25T15:58:23Z

I'm also getting attribute 'coreutils' missing when I just apply this patch and try to cross-compile openssl_1_1. Presumably this is because openssl is part of the bootstrapping process, and at the point where it's supposed to work, buildPackages.coreutils doesn't exist yet?

We could do something like
if buildPackages ? coreutils then buildPackages.coreutils else coreutils
but maybe that's too kludgy. It did fix the issue for me.

Ericson2314 · 2021-04-26T18:53:28Z

I fixed it; the bootstrapping issue was just because of the fetchurl overrides in all-packages.nix being quite delicate.

I also answered by question above; config is not installed so this is perfectly safe.

Radvendii · 2021-04-26T21:56:06Z

Can confirm that this fixed it for me.

When I compile pkgsStatic.openssl, the tests fail to build, and I need to add "no-tests" to the configureFlags, and then it works. Can we add that in this PR, or should I open a new one after this is merged for "openssl: fix static compile"

Ericson2314 · 2021-04-27T03:48:40Z

@Radvendii Let's just do that separately.

brano543 force-pushed the openssl_mingw_fix branch from d937849 to 23ac4d8 Compare January 1, 2021 23:05

ofborg bot added 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Jan 1, 2021

flokli requested a review from peti January 2, 2021 23:33

Mic92 reviewed Jan 10, 2021

View reviewed changes

pkgs/development/libraries/openssl/default.nix Outdated Show resolved Hide resolved

Mic92 requested a review from Ericson2314 January 10, 2021 15:40

peti requested changes Jan 10, 2021

View reviewed changes

SuperSandro2000 added the 2.status: merge conflict label Jan 10, 2021

flokli added the 9.needs: clean-up label Jan 10, 2021

brano543 force-pushed the openssl_mingw_fix branch from 3542e6b to b9b1530 Compare January 10, 2021 20:00

Mic92 requested changes Jan 10, 2021

View reviewed changes

pkgs/development/libraries/openssl/default.nix Outdated Show resolved Hide resolved

pkgs/development/libraries/openssl/default.nix Outdated Show resolved Hide resolved

pkgs/development/libraries/openssl/default.nix Outdated Show resolved Hide resolved

ofborg bot removed the 2.status: merge conflict label Jan 10, 2021

brano543 force-pushed the openssl_mingw_fix branch from b9b1530 to f958547 Compare January 11, 2021 19:13

brano543 requested review from Mic92 and peti January 11, 2021 19:14

Radvendii mentioned this pull request Apr 25, 2021

Cross-compiling OpenSSL 1.1 is broken on most platforms #82924

Closed

Ericson2314 force-pushed the openssl_mingw_fix branch from f958547 to e60989a Compare April 26, 2021 18:49

openssl: correct cross compile for mingw

dc9694c

Ericson2314 force-pushed the openssl_mingw_fix branch from e60989a to dc9694c Compare April 26, 2021 18:52

Ericson2314 approved these changes Apr 26, 2021

View reviewed changes

ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 and removed 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Apr 26, 2021

Ericson2314 merged commit 61a31ad into NixOS:master Apr 27, 2021

This was referenced Apr 27, 2021

pkgsStatic: don't overwrite openssl version #120608

Closed

openssl: fix static compilation on windows #120900

Closed

opusfile: fix windows compilation #120912

Merged

veprbl mentioned this pull request Jan 26, 2022

openssl: better check that withPerl=false prevents perl reference #156776

Closed

13 tasks

brano543 deleted the openssl_mingw_fix branch August 30, 2023 23:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Openssl mingw fix #108170

Openssl mingw fix #108170

brano543 commented Jan 1, 2021

brano543 commented Jan 1, 2021

SuperSandro2000 commented Jan 1, 2021

brano543 commented Jan 1, 2021

brano543 commented Jan 1, 2021

brano543 commented Jan 2, 2021

brano543 commented Jan 2, 2021

flokli commented Jan 2, 2021

brano543 commented Jan 3, 2021

SuperSandro2000 commented Jan 10, 2021

brano543 commented Jan 10, 2021

peti left a comment •

edited

flokli commented Jan 10, 2021 •

edited

brano543 commented Jan 10, 2021

Ericson2314 commented Jan 10, 2021

Mic92 left a comment

brano543 commented Jan 11, 2021

Ericson2314 commented Jan 11, 2021

brano543 commented Jan 12, 2021

Mic92 commented Jan 12, 2021 •

edited

Radvendii commented Apr 25, 2021

Ericson2314 commented Apr 26, 2021 •

edited

Radvendii commented Apr 26, 2021

Ericson2314 commented Apr 27, 2021

Openssl mingw fix #108170

Openssl mingw fix #108170

Conversation

brano543 commented Jan 1, 2021

Motivation for this change

Things done

brano543 commented Jan 1, 2021

SuperSandro2000 commented Jan 1, 2021

brano543 commented Jan 1, 2021

brano543 commented Jan 1, 2021

brano543 commented Jan 2, 2021

brano543 commented Jan 2, 2021

flokli commented Jan 2, 2021

brano543 commented Jan 3, 2021

SuperSandro2000 commented Jan 10, 2021

brano543 commented Jan 10, 2021

peti left a comment • edited

Choose a reason for hiding this comment

flokli commented Jan 10, 2021 • edited

brano543 commented Jan 10, 2021

Ericson2314 commented Jan 10, 2021

Mic92 left a comment

Choose a reason for hiding this comment

brano543 commented Jan 11, 2021

Ericson2314 commented Jan 11, 2021

brano543 commented Jan 12, 2021

Mic92 commented Jan 12, 2021 • edited

Radvendii commented Apr 25, 2021

Ericson2314 commented Apr 26, 2021 • edited

Radvendii commented Apr 26, 2021

Ericson2314 commented Apr 27, 2021

peti left a comment •

edited

flokli commented Jan 10, 2021 •

edited

Mic92 commented Jan 12, 2021 •

edited

Ericson2314 commented Apr 26, 2021 •

edited