From 6697c41feb8027ae1a6b3a05508ef60fe8551a48 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Wed, 3 May 2023 13:02:49 +1200 Subject: [PATCH] openssl: Fix windows cross compile It was broken by 18f1be707120b0bb5e2ddfb5058bc8d3c16f18cb --- pkgs/development/libraries/openssl/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index c36219245a4b..bbc9353a0c89 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -69,7 +69,9 @@ let !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; - nativeBuildInputs = [ makeWrapper perl ] + nativeBuildInputs = + lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper + ++ [ perl ] ++ lib.optionals static [ removeReferencesTo ]; buildInputs = lib.optional withCryptodev cryptodev ++ lib.optional withZlib zlib; @@ -170,12 +172,16 @@ let mkdir -p $bin mv $out/bin $bin/bin + '' + lib.optionalString (!stdenv.hostPlatform.isWindows) + # makeWrapper is broken for windows cross (https://github.com/NixOS/nixpkgs/issues/120726) + '' # c_rehash is a legacy perl script with the same functionality # as `openssl rehash` # this wrapper script is created to maintain backwards compatibility without # depending on perl makeWrapper $bin/bin/openssl $bin/bin/c_rehash \ --add-flags "rehash" + '' + '' mkdir $dev mv $out/include $dev/