nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #108170 from brano543/openssl_mingw_fix

Browse Source 
Openssl mingw fix
This commit is contained in:
John Ericson 2021-04-26 23:48:13 -04:00 committed by GitHub
commit 61a31ad3d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/openssl/default.nix
View File

@ -6,7 +6,7 @@
# Used to avoid cross compiling perl, for example, in darwin bootstrap tools.
# This will cause c_rehash to refer to perl via the environment, but otherwise
# will produce a perfectly functional openssl binary and library.
, withPerl ? true
, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform
}:
assert (
@ -42,8 +42,10 @@ let
substituteInPlace "$a" \
--replace /bin/rm rm
done
'' + optionalString (versionAtLeast version "1.1.1") ''
substituteInPlace config --replace '/usr/bin/env' '${coreutils}/bin/env'
''
# config is a configure script which is not installed.
+ optionalString (versionAtLeast version "1.1.1") ''
substituteInPlace config --replace '/usr/bin/env' '${buildPackages.coreutils}/bin/env'
'' + optionalString (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) ''
substituteInPlace crypto/async/arch/async_posix.h \
--replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \

21
pkgs/top-level/all-packages.nix
View File

@ -465,16 +465,18 @@ in
perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };
openssl = buildPackages.openssl.override {
fetchurl = stdenv.fetchurlBoot;
coreutils = buildPackages.coreutils.override {
fetchurl = stdenv.fetchurlBoot;
buildPackages = {
coreutils = buildPackages.coreutils.override {
fetchurl = stdenv.fetchurlBoot;
inherit perl;
xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; };
gmp = null;
aclSupport = false;
attrSupport = false;
};
inherit perl;
xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; };
gmp = null;
aclSupport = false;
attrSupport = false;
};
inherit perl;
buildPackages = { inherit perl; };
};
libssh2 = buildPackages.libssh2.override {
fetchurl = stdenv.fetchurlBoot;
@ -16901,10 +16903,7 @@ in
wolfssl = callPackage ../development/libraries/wolfssl { };
openssl =
if stdenv.hostPlatform.isMinGW # Work around broken cross build
then openssl_1_0_2
else openssl_1_1;
openssl = openssl_1_1;
inherit (callPackages ../development/libraries/openssl { })
openssl_1_0_2