From 9f05b9d63451d37130d9958f26a3655bc8b274da Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 1 Dec 2022 22:46:16 +0000 Subject: [PATCH] libtorrent-rasterbar-1_2_x: use python3 by default All packages that depend on it are already overriding the default python to python3 in all-packages.nix. Let's just make it the default instead. --- pkgs/applications/networking/p2p/tribler/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index e74db03b5332..5bc1cb726443 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -8,8 +8,7 @@ }: let - libtorrent = (python3.pkgs.toPythonModule ( - libtorrent-rasterbar-1_2_x.override { python = python3; })).python; + libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python; in stdenv.mkDerivation rec { pname = "tribler"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd2356a81471..b7282a05c0f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6249,7 +6249,7 @@ with pkgs; ddrutility = callPackage ../tools/system/ddrutility { }; inherit (callPackages ../applications/networking/p2p/deluge { - libtorrent-rasterbar = libtorrent-rasterbar-1_2_x.override { python = python3; }; + libtorrent-rasterbar = libtorrent-rasterbar-1_2_x; }) deluge-gtk deluged @@ -21113,7 +21113,7 @@ with pkgs; libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - python = python2; + python = python3; }; libtorrent-rasterbar = libtorrent-rasterbar-2_0_x;