From d300f60beaf3012d357e14d61d30e254ccb78634 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 13 May 2023 20:04:39 -0400 Subject: [PATCH] nzbget: make compatible with openssl 3 --- pkgs/tools/networking/nzbget/default.nix | 41 +++++++++++++++++++++--- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index fc44c193b06..9141a2932bb 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, ncurses, libsigcxx, libpar2 -, gnutls, libgcrypt, zlib, openssl, nixosTests }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, gnutls +, libgcrypt +, libpar2 +, libsigcxx +, libxml2 +, ncurses +, openssl +, zlib +, nixosTests +}: stdenv.mkDerivation rec { pname = "nzbget"; @@ -7,13 +20,31 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz"; - sha256 = "sha256-To/BvrgNwq8tajajOjP0Te3d1EhgAsZE9MR5MEMHICU="; + hash = "sha256-To/BvrgNwq8tajajOjP0Te3d1EhgAsZE9MR5MEMHICU="; }; + patches = [ + # openssl 3 compatibility + # https://github.com/nzbget/nzbget/pull/793 + (fetchpatch { + name = "daemon-connect-dont-use-fips-mode-set-with-openssl-3.patch"; + url = "https://github.com/nzbget/nzbget/commit/f76e8555504e3af4cf8dd4a8c8e374b3ca025099.patch"; + hash = "sha256-39lvnhBK4126TYsRbJOUxsV9s9Hjuviw7CH/wWn/VkM="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxml2 ncurses libsigcxx libpar2 gnutls - libgcrypt zlib openssl ]; + buildInputs = [ + gnutls + libgcrypt + libpar2 + libsigcxx + libxml2 + ncurses + openssl + zlib + ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 227db0bd300..8bfebe84861 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10568,9 +10568,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - nzbget = callPackage ../tools/networking/nzbget { - openssl = openssl_1_1; - }; + nzbget = callPackage ../tools/networking/nzbget { }; nzbhydra2 = callPackage ../servers/nzbhydra2 { # You need Java (at least 8, at most 15)