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: 698e506cd62b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c26026f1adee
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 7, 2020

  1. vdr: 2.4.1 -> 2.4.4

    ckesg committed Sep 7, 2020
    Copy the full SHA
    6378df3 View commit details

Commits on Sep 8, 2020

  1. Merge pull request #97397 from ck3d/vdr-2.4.4

    vdr: 2.4.1 -> 2.4.4
    markuskowa authored Sep 8, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c26026f View commit details
Showing with 7 additions and 26 deletions.
  1. +7 −11 pkgs/applications/video/vdr/default.nix
  2. +0 −15 pkgs/applications/video/vdr/glibc2.31-compat.patch
18 changes: 7 additions & 11 deletions pkgs/applications/video/vdr/default.nix
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
{ stdenv, fetchurl, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig
, gettext, systemd, perl, lib, fetchpatch
{ stdenv, fetchgit, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig
, gettext, systemd, perl, lib
, enableSystemd ? true
, enableBidi ? true
}: stdenv.mkDerivation rec {

pname = "vdr";
version = "2.4.1";
version = "2.4.4";

src = fetchurl {
url = "ftp://ftp.tvdr.de/vdr/${pname}-${version}.tar.bz2";
sha256 = "1p51b14aqzncx3xpfg0rjplc48pg7520035i5p6r5zzkqhszihr5";
src = fetchgit {
url = "git://git.tvdr.de/vdr.git";
rev = "V20404";
sha256 = "1fzghnp5mpcwn3a3fyk3w8h15z4f2cnc75247kvxj1c9069mgnwa";
};

patches = [
# Derived from http://git.tvdr.de/?p=vdr.git;a=commit;h=930c2cd2eb8947413e88404fa94c66e4e1db5ad6
./glibc2.31-compat.patch
];

enableParallelBuilding = true;

postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd";
15 changes: 0 additions & 15 deletions pkgs/applications/video/vdr/glibc2.31-compat.patch

This file was deleted.