From 2d11ec06121f43e73f13fb3ad4b524c570d610ea Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sun, 18 Mar 2018 18:38:07 -0400 Subject: [PATCH] mythtv: 0.27.4 -> 29.1 (cherry picked from commit 70abab8eaf8e5b9f80ccee2ba5e7ee8378bbee86) --- pkgs/applications/video/mythtv/default.nix | 29 +++++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 6f7ebb8c20af61..1be4fc252fd012 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,27 +1,32 @@ -{ stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec -, lame, zlib, libGLU_combined, alsaLib, freetype, perl, pkgconfig -, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu -, yasm, libuuid, taglib, libtool, autoconf, automake, file +{ stdenv, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper +, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype +, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm +, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2 +, linuxHeaders }: stdenv.mkDerivation rec { name = "mythtv-${version}"; - version = "0.27.4"; + version = "29.1"; - src = fetchurl { - url = "https://github.com/MythTV/mythtv/archive/v${version}.tar.gz"; - sha256 = "0nrn4fbkkzh43n7jgbv21i92sb4z4yacwj9yj6m3hjbffzy4ywqz"; + src = fetchFromGitHub { + owner = "MythTV"; + repo = "mythtv"; + rev = "v${version}"; + sha256 = "0pjxv4bmq8h285jsr02svgaa03614arsyk12fn9d4rndjsi2cc3x"; }; - sourceRoot = "${name}/mythtv"; + setSourceRoot = ''sourceRoot=$(echo */mythtv)''; buildInputs = [ - freetype qt4 lame zlib xlibsWrapper libGLU_combined perl alsaLib libpulseaudio fftwSinglePrec - libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu - libuuid taglib + freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU_combined + perl alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC + libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 ]; nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ]; + configureFlags = [ "--dvb-path=${linuxHeaders}/include" ]; + meta = with stdenv.lib; { homepage = https://www.mythtv.org/; description = "Open Source DVR"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca7d01d8e60b29..004ad94f206ea6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16869,7 +16869,7 @@ with pkgs; mypaint = callPackage ../applications/graphics/mypaint { }; - mythtv = callPackage ../applications/video/mythtv { }; + mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; micro = callPackage ../applications/editors/micro { };