summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorajs124 <git@ajs124.de>2023-01-06 18:00:49 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-01-10 20:07:21 +0000
commit96d5a03c5f456442f1764354022cf10fc1ec4496 (patch)
treefa9b55e40b82149dc39b94b94aabe267c684651a
parent48bd2d0ebf786ab6ec48557b04dca32cac7d4bc9 (diff)
transmission: use openssl_legacy
instead of broken debian/ubuntu patch (cherry picked from commit 52fe5d3bb6405aa3956df6b6fecdd08dde75e188)
-rw-r--r--pkgs/applications/networking/p2p/transmission/default.nix9
-rw-r--r--pkgs/top-level/all-packages.nix5
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;