From 96d5a03c5f456442f1764354022cf10fc1ec4496 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 6 Jan 2023 18:00:49 +0100 Subject: transmission: use openssl_legacy instead of broken debian/ubuntu patch (cherry picked from commit 52fe5d3bb6405aa3956df6b6fecdd08dde75e188) --- pkgs/applications/networking/p2p/transmission/default.nix | 9 --------- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 2bb2967ec745..f3a33c2194cb 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchurl , cmake , pkg-config , openssl @@ -47,14 +46,6 @@ in stdenv.mkDerivation { fetchSubmodules = true; }; - patches = [ - # fix build with openssl 3.0 - (fetchurl { - url = "https://salsa.debian.org/debian/transmission/-/raw/debian/3.00-2.1/debian/patches/openssl3-compat.patch"; - hash = "sha256-v+SDTW/lCtc8B3TuhQB1pmjW/QRAGLtYncaImNNwpes="; - }) - ]; - outputs = [ "out" "apparmor" ]; cmakeFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f0ede992bfb..16acf28b388d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32481,7 +32481,10 @@ with pkgs; transcribe = callPackage ../applications/audio/transcribe { }; - transmission = callPackage ../applications/networking/p2p/transmission { }; + transmission = callPackage ../applications/networking/p2p/transmission { + # https://github.com/NixOS/nixpkgs/issues/207047 + openssl = openssl_legacy; + }; libtransmission = transmission.override { installLib = true; enableDaemon = false; -- cgit v1.2.3