Skip to content

Commit b06ff4b

Browse files
authored
Merge pull request NixOS#276743 from raphaelr/fix/liboqs
liboqs: Fix build error
2 parents 9b8cec7 + a35d101 commit b06ff4b

File tree

2 files changed

+38
-0
lines changed

2 files changed

+38
-0
lines changed

pkgs/development/libraries/liboqs/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
1717
sha256 = "sha256-h3mXoGRYgPg0wKQ1u6uFP7wlEUMQd5uIBt4Hr7vjNtA=";
1818
};
1919

20+
patches = [ ./fix-openssl-detection.patch ];
21+
2022
nativeBuildInputs = [ cmake ];
2123
buildInputs = [ openssl ];
2224

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From 6bdcf53de74ac2afba42deea63522939ca51f871 Mon Sep 17 00:00:00 2001
2+
From: Raphael Robatsch <raphael-git@tapesoftware.net>
3+
Date: Mon, 25 Dec 2023 16:15:29 +0000
4+
Subject: [PATCH] Do not forcibly set OPENSSL_ROOT_DIR.
5+
6+
CMake can already find OpenSSL via pkg-config. Setting OPENSSL_ROOT_DIR
7+
forcibly to "/usr" breaks this.
8+
---
9+
CMakeLists.txt | 11 -----------
10+
1 file changed, 11 deletions(-)
11+
12+
diff --git a/CMakeLists.txt b/CMakeLists.txt
13+
index 288bcbe8..9750fae6 100644
14+
--- a/CMakeLists.txt
15+
+++ b/CMakeLists.txt
16+
@@ -119,17 +119,6 @@ include(.CMake/compiler_opts.cmake)
17+
include(.CMake/alg_support.cmake)
18+
19+
if(${OQS_USE_OPENSSL})
20+
- if(NOT DEFINED OPENSSL_ROOT_DIR)
21+
- if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin")
22+
- if(EXISTS "/usr/local/opt/openssl@1.1")
23+
- set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@1.1")
24+
- elseif(EXISTS "/opt/homebrew/opt/openssl@1.1")
25+
- set(OPENSSL_ROOT_DIR "/opt/homebrew/opt/openssl@1.1")
26+
- endif()
27+
- elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
28+
- set(OPENSSL_ROOT_DIR "/usr")
29+
- endif()
30+
- endif()
31+
find_package(OpenSSL 1.1.1 REQUIRED)
32+
endif()
33+
34+
--
35+
2.42.0
36+

0 commit comments

Comments
 (0)