Unverified Commit c4acb8b9 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #229465 from hamishmack/hkm/openssl-windows-cross 

openssl: Fix windows cross compile
parents e218071c 6697c41f

pkgs/development/libraries/openssl/default.nix

+7 −1
Original line number Diff line number Diff line
@@ -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/