diff options
| author | Milan Pässler <mil@nyantec.com> | 2020-12-19 17:15:22 +0100 |
|---|---|---|
| committer | Milan <me@pbb.lc> | 2020-12-20 15:48:58 +0100 |
| commit | 1edfaa4a0d23be205588a05979a11e7c9af10a11 (patch) | |
| tree | 58ed9c193c31ed951989f268338acca5c1802528 /pkgs/top-level | |
| parent | 49ea33f24c6bcde6b6060303e906f01c579cde77 (diff) | |
libtorrentRasterbar-2_0_x: init at 2.0.1
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 5 |
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; }; |