diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/development/libraries/liboqs | |
parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/liboqs')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/liboqs/default.nix | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/liboqs/fix-openssl-detection.patch | 36 |
2 files changed, 38 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/liboqs/default.nix b/nixpkgs/pkgs/development/libraries/liboqs/default.nix index c2a0216a34e1..4962f9459d79 100644 --- a/nixpkgs/pkgs/development/libraries/liboqs/default.nix +++ b/nixpkgs/pkgs/development/libraries/liboqs/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-h3mXoGRYgPg0wKQ1u6uFP7wlEUMQd5uIBt4Hr7vjNtA="; }; + patches = [ ./fix-openssl-detection.patch ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/development/libraries/liboqs/fix-openssl-detection.patch b/nixpkgs/pkgs/development/libraries/liboqs/fix-openssl-detection.patch new file mode 100644 index 000000000000..33be7188370f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/liboqs/fix-openssl-detection.patch @@ -0,0 +1,36 @@ +From 6bdcf53de74ac2afba42deea63522939ca51f871 Mon Sep 17 00:00:00 2001 +From: Raphael Robatsch <raphael-git@tapesoftware.net> +Date: Mon, 25 Dec 2023 16:15:29 +0000 +Subject: [PATCH] Do not forcibly set OPENSSL_ROOT_DIR. + +CMake can already find OpenSSL via pkg-config. Setting OPENSSL_ROOT_DIR +forcibly to "/usr" breaks this. +--- + CMakeLists.txt | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 288bcbe8..9750fae6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,17 +119,6 @@ include(.CMake/compiler_opts.cmake) + include(.CMake/alg_support.cmake) + + if(${OQS_USE_OPENSSL}) +- if(NOT DEFINED OPENSSL_ROOT_DIR) +- if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") +- if(EXISTS "/usr/local/opt/openssl@1.1") +- set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@1.1") +- elseif(EXISTS "/opt/homebrew/opt/openssl@1.1") +- set(OPENSSL_ROOT_DIR "/opt/homebrew/opt/openssl@1.1") +- endif() +- elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux") +- set(OPENSSL_ROOT_DIR "/usr") +- endif() +- endif() + find_package(OpenSSL 1.1.1 REQUIRED) + endif() + +-- +2.42.0 + |