Loading pkgs/applications/video/mythtv/default.nix +18 −9 Original line number Diff line number Diff line { 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 = Loading pkgs/applications/video/mythtv/disable-os-detection.patchdeleted 100644 → 0 +0 −31 Original line number Diff line number Diff line --- 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 pkgs/applications/video/mythtv/dont-source-os-release.patch 0 → 100644 +15 −0 Original line number Diff line number Diff line --- 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 pkgs/top-level/all-packages.nix +1 −1 Original line number Diff line number Diff line Loading @@ -30981,7 +30981,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 { }; Loading
pkgs/applications/video/mythtv/default.nix +18 −9 Original line number Diff line number Diff line { 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 = Loading
pkgs/applications/video/mythtv/disable-os-detection.patchdeleted 100644 → 0 +0 −31 Original line number Diff line number Diff line --- 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
pkgs/applications/video/mythtv/dont-source-os-release.patch 0 → 100644 +15 −0 Original line number Diff line number Diff line --- 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
pkgs/top-level/all-packages.nix +1 −1 Original line number Diff line number Diff line Loading @@ -30981,7 +30981,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 { };