diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-07-16 03:43:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-16 03:43:26 +0000 |
commit | 3a35984fb08e775535c200f19dfd4af6bc987f6f (patch) | |
tree | 5f68398eff423d07504ca2e716bd9d2325d859c6 /pkgs | |
parent | decd12286404e4654f56fd8467ecdc1ccaf979ff (diff) | |
parent | 4626d0b2556a5cab8f6ff7fd7cd9966a7ab5a36b (diff) | |
download | nixlib-3a35984fb08e775535c200f19dfd4af6bc987f6f.tar nixlib-3a35984fb08e775535c200f19dfd4af6bc987f6f.tar.gz nixlib-3a35984fb08e775535c200f19dfd4af6bc987f6f.tar.bz2 nixlib-3a35984fb08e775535c200f19dfd4af6bc987f6f.tar.lz nixlib-3a35984fb08e775535c200f19dfd4af6bc987f6f.tar.xz nixlib-3a35984fb08e775535c200f19dfd4af6bc987f6f.tar.zst nixlib-3a35984fb08e775535c200f19dfd4af6bc987f6f.zip |
Merge pull request #43590 from dtzWill/feature/gnomecast
gnomecast: init at 1.4.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/video/gnomecast/default.nix | 28 | ||||
-rw-r--r-- | pkgs/development/python-modules/pycaption/default.nix | 41 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 1 |
4 files changed, 72 insertions, 0 deletions
diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix new file mode 100644 index 000000000000..a2faaf39f082 --- /dev/null +++ b/pkgs/applications/video/gnomecast/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, gtk3, gobjectIntrospection, ffmpeg, wrapGAppsHook }: + +with python3Packages; +buildPythonApplication rec { + pname = "gnomecast"; + version = "1.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "17hxqpisw6j6caw6bzp0wd0p3idqy6a78wwwk8kms6hpxasirwyk"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + propagatedBuildInputs = [ + PyChromecast bottle pycaption paste html5lib pygobject3 dbus-python + gtk3 gobjectIntrospection + ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}) + ''; + + meta = with lib; { + description = "A native Linux GUI for Chromecasting local files"; + homepage = https://github.com/keredson/gnomecast; + license = with licenses; [ gpl3 ]; + }; +} diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix new file mode 100644 index 000000000000..845630e514fa --- /dev/null +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -0,0 +1,41 @@ +{ lib, fetchpatch +, buildPythonPackage, fetchPypi, isPy3k, pythonOlder +, beautifulsoup4, lxml, cssutils, future, enum34, six +}: + +buildPythonPackage rec { + pname = "pycaption"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0f2hx9ky65c4niws3x5yx59yi8mqqrw9b2cghd220g4hj9yl800h"; + }; + + disabled = !isPy3k; + + prePatch = '' + substituteInPlace setup.py \ + --replace 'beautifulsoup4>=4.2.1,<4.5.0' \ + 'beautifulsoup4>=4.2.1,<=4.6.0' + ''; + + # don't require enum34 on python >= 3.4 + patches = [ + (fetchpatch { + url = "https://github.com/pbs/pycaption/pull/161.patch"; + sha256 = "0p58awpsqx1qc3x9zfl1gd85h1nk7204lzn4kglsgh1bka0j237j"; + }) + ]; + + propagatedBuildInputs = [ beautifulsoup4 lxml cssutils future enum34 six ]; + + # Tests not included in pypi (?) + doCheck = false; + + meta = with lib; { + description = "Closed caption converter"; + homepage = https://github.com/pbs/pycaption; + license = with licenses; [ asl20 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e42ca369cf84..6e972198f8ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16494,6 +16494,8 @@ with pkgs; gmtp = callPackage ../applications/misc/gmtp {}; + gnomecast = callPackage ../applications/video/gnomecast { }; + gnome-mpv = callPackage ../applications/video/gnome-mpv { }; gollum = callPackage ../applications/misc/gollum { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f04e149bac97..c7b0e838ae6b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10376,6 +10376,7 @@ in { }; }; + pycaption = callPackage ../development/python-modules/pycaption { }; pycdio = buildPythonPackage rec { name = "pycdio-2.0.0"; |