diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-05-18 16:59:02 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-05-18 17:21:08 +0300 |
| commit | 19b4eb82089dfc1b54132e996b3034a72e847223 (patch) | |
| tree | d1f23907087a749300c1288f9a1dab15deaf3133 /pkgs/applications/video/bomi | |
| parent | e919cf0be2b8c4c2033edbbafba3ac8732656947 (diff) | |
| download | nixlib-19b4eb82089dfc1b54132e996b3034a72e847223.tar nixlib-19b4eb82089dfc1b54132e996b3034a72e847223.tar.gz nixlib-19b4eb82089dfc1b54132e996b3034a72e847223.tar.bz2 nixlib-19b4eb82089dfc1b54132e996b3034a72e847223.tar.lz nixlib-19b4eb82089dfc1b54132e996b3034a72e847223.tar.xz nixlib-19b4eb82089dfc1b54132e996b3034a72e847223.tar.zst nixlib-19b4eb82089dfc1b54132e996b3034a72e847223.zip | |
bomi: update, add youtube-dl support
Diffstat (limited to 'pkgs/applications/video/bomi')
| -rw-r--r-- | pkgs/applications/video/bomi/default.nix | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index 83fb7546a3bc..be0517b6376b 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python3, which +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeWrapper , libX11, libxcb, qt5, mesa , ffmpeg , libchardet @@ -15,12 +15,16 @@ , portaudioSupport ? false, portaudio ? null , pulseSupport ? true, pulseaudio ? null , cddaSupport ? false, libcdda ? null +, youtubeSupport ? true, youtube-dl ? null }: +with stdenv.lib; + assert jackSupport -> jack != null; assert portaudioSupport -> portaudio != null; assert pulseSupport -> pulseaudio != null; assert cddaSupport -> libcdda != null; +assert youtubeSupport -> youtube-dl != null; let waf = fetchurl { @@ -32,18 +36,18 @@ in stdenv.mkDerivation rec { name = "bomi-${version}"; - version = "0.9.5"; + version = "0.9.10"; src = fetchFromGitHub { owner = "xylosper"; repo = "bomi"; rev = "v${version}"; - sha256 = "1pf82dp7v18yd7knsjl853sfzhq4rqc3sq15jgqiw37096gp0sll"; + sha256 = "1c7497gks7yxzfy6jx77vn9zs2pdq7y6l9w61miwnkdm91093n17"; }; buildInputs = with stdenv.lib; [ libX11 libxcb mesa - qt5.base qt5.quick1 qt5.x11extras + qt5.base qt5.x11extras qt5.declarative qt5.quickcontrols ffmpeg libchardet mpg123 @@ -65,13 +69,17 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs configure - # src/mpv/waf build-mpv; do ''; preBuild = '' - patchShebangs build-mpv install -m755 ${waf} src/mpv/waf - sed -i '1 s,.*,#!${python3.interpreter},' src/mpv/waf + patchShebangs src/mpv/waf + patchShebangs build-mpv + ''; + + postInstall = '' + wrapProgram $out/bin/bomi \ + ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"} ''; configureFlags = with stdenv.lib; @@ -82,7 +90,7 @@ stdenv.mkDerivation rec { ++ optional cddaSupport "--enable-cdda" ; - nativeBuildInputs = [ pkgconfig perl which ]; + nativeBuildInputs = [ pkgconfig perl python which qt5.tools makeWrapper ]; enableParallelBuilding = true; |