From ffc75d7b6e066c3d06fc8e07c4ef19cbb6faba9b Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sun, 7 Jun 2026 20:34:11 -0400 Subject: [PATCH] libressl: fix Darwin build https://hydra.nixos.org/build/331199232 (cherry picked from commit 3b6967c20926a7c6423ebd9875a6cd18a7f254d5) --- pkgs/by-name/li/libressl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libressl/default.nix b/pkgs/by-name/li/libressl/default.nix index 4ccc79407ba7..4bf139efc381 100644 --- a/pkgs/by-name/li/libressl/default.nix +++ b/pkgs/by-name/li/libressl/default.nix @@ -61,6 +61,10 @@ let doCheck = !(stdenv.hostPlatform.isPower64 || stdenv.hostPlatform.isRiscV); preCheck = '' + export PREVIOUS_${ldLibPathEnvName}=$${ldLibPathEnvName} + export ${ldLibPathEnvName}="$${ldLibPathEnvName}:$(realpath tls/):$(realpath ssl/):$(realpath crypto/)" + '' + + lib.optionalString stdenv.hostPlatform.isElf '' # Bail if any shared object has executable stack enabled. This can # happen when an object produced from an assmbly file in libcrypto is # missing a .note.GNU-stack section. An executable stack is dangerous @@ -76,9 +80,6 @@ let } END { exit res } ' - - export PREVIOUS_${ldLibPathEnvName}=$${ldLibPathEnvName} - export ${ldLibPathEnvName}="$${ldLibPathEnvName}:$(realpath tls/):$(realpath ssl/):$(realpath crypto/)" ''; postCheck = '' export ${ldLibPathEnvName}=$PREVIOUS_${ldLibPathEnvName}