diff options
| author | ajs124 <ajs124@users.noreply.github.com> | 2023-01-11 15:16:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-11 15:16:18 +0100 |
| commit | 7505db1471ac429afb2848240c865ac7fe185966 (patch) | |
| tree | aa4f5963490f7fffccf92c35e4ca88fa3c2e71e9 | |
| parent | 9c8bff77b5d51380f5da349d0a6fc515da6244b0 (diff) | |
| parent | 96d5a03c5f456442f1764354022cf10fc1ec4496 (diff) | |
Merge pull request #210090 from NixOS/backport-209341-to-release-22.11
[Backport release-22.11] transmission: use openssl_legacy
| -rw-r--r-- | pkgs/applications/networking/p2p/transmission/default.nix | 9 | ||||
| -rw-r--r-- | 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 555a1d0db12b..33d9a9b5d835 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32483,7 +32483,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; |