Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 27ae4cea4e73
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f74188b55179
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 27, 2018

  1. mythtv: 0.27.4 -> 29.1 

    (cherry picked from commit 70abab8)
    @danielfullmer @srhb
    danielfullmer authored and srhb committed Mar 27, 2018
    Copy the full SHA
    2d11ec0 View commit details

  2. Merge pull request #37940 from srhb/mythtv-cherry 

    Backport: mythtv: 0.27.4 -> 29.1
    @srhb
    srhb authored Mar 27, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    Zuoqiu-Yingyi Yingyi / 颖逸
    GPG key ID: 833DAD5428FF18A8
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f74188b View commit details
Showing with 18 additions and 13 deletions.
  1. +17 −12 pkgs/applications/video/mythtv/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
29 changes: 17 additions & 12 deletions pkgs/applications/video/mythtv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -16873,7 +16873,7 @@ with pkgs;

mypaint = callPackage ../applications/graphics/mypaint { };

mythtv = callPackage ../applications/video/mythtv { };
mythtv = libsForQt5.callPackage ../applications/video/mythtv { };

micro = callPackage ../applications/editors/micro { };