diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index cf307f0da34e..117212813594 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,32 +1,41 @@ -{ lib, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, which, qtbase, qtwebkit, qtscript, xlibsWrapper , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsa-lib, freetype , perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm -, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders +, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders, soundtouch, libzip +, withWebKit ? false }: mkDerivation rec { pname = "mythtv"; - version = "31.0"; + version = "32.0"; src = fetchFromGitHub { owner = "MythTV"; repo = "mythtv"; rev = "v${version}"; - sha256 = "092w5kvc1gjz6jd2lk2jhcazasz2h3xh0i5iq80k8x3znyp4i6v5"; + sha256 = "0i4fs3rbk1jggh62wflpa2l03na9i1ihpz2vsdic9vfahqqjxff1"; }; patches = [ - # Disables OS detection used while checking if enforce_wshadow should be disabled. - ./disable-os-detection.patch + # Disable sourcing /etc/os-release + ./dont-source-os-release.patch + + # Fix QMake variable substitution syntax - MythTV/mythtv#550 + (fetchpatch { + name = "fix-qmake-var-syntax.patch"; + url = "https://github.com/MythTV/mythtv/commit/a8da7f7e7ec069164adbef65a8104adc9bb52e36.patch"; + stripLen = 1; + hash = "sha256-JfRME00YNNjl6SKs1HBa0wBa/lR/Rt3zbQtWhsC36JM="; + }) ]; setSourceRoot = "sourceRoot=$(echo */mythtv)"; buildInputs = [ - freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU libGL + freetype qtbase qtscript lame zlib xlibsWrapper libGLU libGL perl libsamplerate libbluray lzo alsa-lib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC - libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 - ]; + libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 soundtouch libzip + ] ++ lib.optional withWebKit qtwebkit; nativeBuildInputs = [ pkg-config which yasm libtool autoconf automake file ]; configureFlags = diff --git a/pkgs/applications/video/mythtv/disable-os-detection.patch b/pkgs/applications/video/mythtv/disable-os-detection.patch deleted file mode 100644 index 09ce6f6ca4f8..000000000000 --- a/pkgs/applications/video/mythtv/disable-os-detection.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/configure 2020-07-21 20:50:58.653989766 +0200 -+++ b/configure 2020-07-21 20:52:21.236610586 +0200 -@@ -6537,17 +6537,17 @@ - } - - enable enforce_wshadow --case $target_os in -- android) -- disable enforce_wshadow -- ;; -- linux) -- . /etc/os-release -- if test $ID = "centos"; then -- disable enforce_wshadow -- fi -- ;; --esac -+#case $target_os in -+# android) -+# disable enforce_wshadow -+# ;; -+# linux) -+# . /etc/os-release -+# if test $ID = "centos"; then -+# disable enforce_wshadow -+# fi -+# ;; -+#esac - - if $(pkg-config --exists Qt5WebKit) || $(pkg-config --exists QtWebKit) ; then - enable qtwebkit diff --git a/pkgs/applications/video/mythtv/dont-source-os-release.patch b/pkgs/applications/video/mythtv/dont-source-os-release.patch new file mode 100644 index 000000000000..fb4dc686af6a --- /dev/null +++ b/pkgs/applications/video/mythtv/dont-source-os-release.patch @@ -0,0 +1,15 @@ +--- a/configure ++++ b/configure +@@ -5894,9 +5894,9 @@ else + die "ERROR: cannot find soundtouch 1.8.0 or later." + fi + +-if [ $target_os = "linux" ] ; then +- . /etc/os-release +-fi ++# if [ $target_os = "linux" ] ; then ++# . /etc/os-release ++# fi + + # libudfread + if enabled system_libudfread ; then diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed7f7bd924b5..d06d455c9210 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30973,7 +30973,7 @@ with pkgs; mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { }; - mythtv = libsForQt514.callPackage ../applications/video/mythtv { }; + mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; micro = callPackage ../applications/editors/micro { };