From 0e4ce20f5d8dd23bf09f710577ec3dcb2fa84491 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 19 Dec 2025 23:19:33 +0100 Subject: [PATCH] lemmy: prepare for structuredAttrs by moving OPENSSL_NO_VENDOR into env --- pkgs/servers/web-apps/lemmy/server.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index c1c354856c77..788e03e03fc7 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -39,15 +39,17 @@ rustPlatform.buildRustPackage rec { libiconv ]; - # Using OPENSSL_NO_VENDOR is not an option on darwin - # As of version 0.10.35 rust-openssl looks for openssl on darwin - # with a hardcoded path to /usr/lib/libssl.x.x.x.dylib - # https://github.com/sfackler/rust-openssl/blob/master/openssl-sys/build/find_normal.rs#L115 - OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; - OPENSSL_INCLUDE_DIR = "${openssl.dev}/include"; + env = { + # Using OPENSSL_NO_VENDOR is not an option on darwin + # As of version 0.10.35 rust-openssl looks for openssl on darwin + # with a hardcoded path to /usr/lib/libssl.x.x.x.dylib + # https://github.com/sfackler/rust-openssl/blob/master/openssl-sys/build/find_normal.rs#L115 + OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; + OPENSSL_INCLUDE_DIR = "${openssl.dev}/include"; - PROTOC = "${protobuf}/bin/protoc"; - PROTOC_INCLUDE = "${protobuf}/include"; + PROTOC = "${protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; + }; nativeBuildInputs = [ protobuf rustfmt