summaryrefslogtreecommitdiffstats
path: root/pkgs/top-level
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix9
-rw-r--r--pkgs/top-level/python-packages.nix5
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4cdf4ec16500..d0ffd9d20d2e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3333,7 +3333,7 @@ in
deluge-2_x = callPackage ../applications/networking/p2p/deluge/2 {
pythonPackages = python3Packages;
- libtorrentRasterbar = libtorrentRasterbar.override { python = python3; };
+ libtorrentRasterbar = libtorrentRasterbar-1_2_x.override { python = python3; };
};
deluge-1_x = callPackage ../applications/networking/p2p/deluge/1 {
pythonPackages = python2Packages;
@@ -14674,13 +14674,18 @@ in
libtomcrypt = callPackage ../development/libraries/libtomcrypt { };
+ libtorrentRasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar/2.0 {
+ inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
+ python = python3;
+ };
+
libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2 {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
};
libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1 { };
- libtorrentRasterbar = libtorrentRasterbar-1_2_x;
+ libtorrentRasterbar = libtorrentRasterbar-2_0_x;
# this is still the new version of the old API
libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index be2cca02f76a..33711b7d4ed7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3514,7 +3514,10 @@ in {
libtmux = callPackage ../development/python-modules/libtmux { };
- libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override { inherit python; })).python;
+ libtorrentRasterbar = if isPy27 then
+ (toPythonModule (pkgs.libtorrentRasterbar-1_2_x.override { inherit python; })).python
+ else
+ (toPythonModule (pkgs.libtorrentRasterbar.override { inherit python; })).python;
libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; };