From 155fb5be701345e2ae36ff022a9a78bcfdb2e58f Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Sun, 1 Sep 2024 00:46:26 +0300 Subject: [PATCH] openssl: use makeBinaryWrapper instead of makeShellWrapper This changes openssl to use makeBinaryWrapper since makeWrapper uses non-overridable runtimeShell that causes infinite recursion. That is, fetchurl in pkgs/top-level/all-packages.nix is bootstrapped by overriding dependencies to use stdenv.fetchurlBoot. --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5ddb26798af5..27aea4bb2e34 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, buildPackages, perl, coreutils, writeShellScript -, makeWrapper +, makeBinaryWrapper , withCryptodev ? false, cryptodev , withZlib ? false, zlib , enableSSL2 ? false @@ -70,7 +70,7 @@ let stdenv.cc.isGNU; nativeBuildInputs = - lib.optional (!stdenv.hostPlatform.isWindows) makeWrapper + lib.optional (!stdenv.hostPlatform.isWindows) makeBinaryWrapper ++ [ perl ] ++ lib.optionals static [ removeReferencesTo ]; buildInputs = lib.optional withCryptodev cryptodev