about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2023-02-22 13:14:48 +0100
committerVladimír Čunát <v@cunat.cz>2023-02-22 13:28:15 +0100
commitb96fd5a538086608c9265cea359ee64321b8aa01 (patch)
tree286a256ba0bd9c127376b165a7d6cbc0f40c8c48
parente32259e470e282224ea80605153eafe16848bafb (diff)
parente49dc267614001cfa1e492a2f0a4934f301435f3 (diff)
Merge #216953: transmission: patch to load legacy openssl provider
-rw-r--r--pkgs/applications/networking/p2p/transmission/default.nix9
-rw-r--r--pkgs/top-level/all-packages.nix5
2 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 8d605877a62ea..8f44d79f817dd 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchFromGitHub
+, fetchurl
 , cmake
 , pkg-config
 , openssl
@@ -46,6 +47,14 @@ in stdenv.mkDerivation {
     fetchSubmodules = true;
   };
 
+  patches = [
+    # fix build with openssl 3.0
+    (fetchurl {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-p2p/transmission/files/transmission-3.00-openssl-3.patch";
+      hash = "sha256-peVrkGck8AfbC9uYNfv1CIu1alIewpca7A6kRXjVlVs=";
+    })
+  ];
+
   outputs = [ "out" "apparmor" ];
 
   cmakeFlags =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 237e1b1b4a74d..eee8d121b45db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33527,10 +33527,7 @@ with pkgs;
 
   transcribe = callPackage ../applications/audio/transcribe { };
 
-  transmission = callPackage ../applications/networking/p2p/transmission {
-    # https://github.com/NixOS/nixpkgs/issues/207047
-    openssl = openssl_legacy;
-  };
+  transmission = callPackage ../applications/networking/p2p/transmission { };
   libtransmission = transmission.override {
     installLib = true;
     enableDaemon = false;