BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #204017 from thiagokokada/libtorrent-rasterbar-make-python3-default

Browse source
This commit is contained in:
Sandro 2022-12-02 00:08:21 +01:00 committed by GitHub
commit f2f2a140ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/networking/p2p/tribler/default.nix
View file

@ -8,8 +8,7 @@
}: }:
let let
libtorrent = (python3.pkgs.toPythonModule ( libtorrent = (python3.pkgs.toPythonModule (libtorrent-rasterbar-1_2_x)).python;
libtorrent-rasterbar-1_2_x.override { python = python3; })).python;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tribler"; pname = "tribler";

4
pkgs/top-level/all-packages.nix
View file

@ -6249,7 +6249,7 @@ with pkgs;
ddrutility = callPackage ../tools/system/ddrutility { }; ddrutility = callPackage ../tools/system/ddrutility { };
inherit (callPackages ../applications/networking/p2p/deluge { 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 deluge-gtk
deluged deluged
@ -21103,7 +21103,7 @@ with pkgs;
libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix { libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration; inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
python = python2; python = python3;
}; };
libtorrent-rasterbar = libtorrent-rasterbar-2_0_x; libtorrent-rasterbar = libtorrent-rasterbar-2_0_x;