Unverified Commit 3e14bab7 authored by Sefa Eyeoglu's avatar Sefa Eyeoglu
Browse files

mpd: 0.23.16 -> 0.23.17 

mpd has fixed a bug with upstream yajl in https://github.com/MusicPlayerDaemon/MPD/commit/0aeda01ba6d22a8d9fc583faa67ffc6473869a43

We use a fork of yajl which isn't affected by this issue because of https://github.com/containers/yajl/commit/349e55e657024e5ded864601a370f8051d19628c



Signed-off-by: default avatarSefa Eyeoglu <contact@scrumplex.net>
parent 6415f787

pkgs/servers/mpd/default.nix

+14 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch2,

  meson,

  ninja,

  pkg-config,
@@ -201,15 +202,26 @@ let 
    in

    stdenv.mkDerivation rec {

      pname = "mpd";

      version = "0.23.16";

      version = "0.23.17";



      src = fetchFromGitHub {

        owner = "MusicPlayerDaemon";

        repo = "MPD";

        rev = "v${version}";

        sha256 = "sha256-0To+V+4xLjymGpRSpsyE/Une5uUpCEiAg+d041guPA0=";

        sha256 = "sha256-1+eVLvwMp6mR38y39wV73rhPA998ip7clyyKcJ008z0=";

      };



      patches = [

        # Revert of https://github.com/MusicPlayerDaemon/MPD/commit/0aeda01ba6d22a8d9fc583faa67ffc6473869a43

        # We use a yajl fork that fixed this issue in the pkg-config manifest

        (fetchpatch2 {

          name = "revert-yajl-include-fix.patch";

          url = "https://github.com/MusicPlayerDaemon/MPD/commit/0aeda01ba6d22a8d9fc583faa67ffc6473869a43.diff";

          hash = "sha256-p/sYvWpr0GTw8gjt+W9FQysadOK/QOUp81ykTI50UYg=";

          revert = true;

        })

      ];



      buildInputs =

        [

          glib