Unverified Commit 909c704f authored by 25huizengek1's avatar 25huizengek1
Browse files

mpd: 0.24.2 -> 0.24.3

parent 1947acf9

pkgs/servers/mpd/default.nix

+20 −33
Original line number Diff line number Diff line
@@ -50,8 +50,9 @@ 
  pcre2,

  libgcrypt,

  expat,

  # Services

  yajl,

  nlohmann_json,

  zlib,

  libupnp,

  # Client support

  libmpdclient,

  # Tag support
@@ -116,16 +117,15 @@ let 
    qobuz = [

      curl

      libgcrypt

      yajl

    ];

    soundcloud = [

      curl

      yajl

      nlohmann_json

    ];

    # Client support

    libmpdclient = [ libmpdclient ];

    # Tag support

    id3tag = [ libid3tag ];

    id3tag = [

      libid3tag

      zlib

    ];

    # Misc

    dbus = [ dbus ];

    expat = [ expat ];
@@ -134,7 +134,6 @@ let 
    sqlite = [ sqlite ];

    syslog = [ ];

    systemd = [ systemd ];

    yajl = [ yajl ];

    zeroconf = [

      avahi

      dbus
@@ -197,13 +196,13 @@ let 
    in

    stdenv.mkDerivation rec {

      pname = "mpd";

      version = "0.24.2";

      version = "0.24.3";



      src = fetchFromGitHub {

        owner = "MusicPlayerDaemon";

        repo = "MPD";

        rev = "v${version}";

        sha256 = "sha256-6wEFgiMsEoWvmfH609d+UZY7jzqDoNmXalpHBipqTN0=";

        sha256 = "sha256-lbYQ3fHq1Z6i3zVdLiO9q+3t2BkREwvgOHUVfTJniNg=";

      };



      buildInputs = [
@@ -214,6 +213,7 @@ let 
        #

        #    Run-time dependency GTest found: YES 1.10.0

        gtest

        libupnp

      ] ++ concatAttrVals features_ featureDependencies;



      nativeBuildInputs = [
@@ -225,18 +225,6 @@ let 
      depsBuildBuild = [ buildPackages.stdenv.cc ];



      postPatch =

        ''

          # Basically a revert of https://github.com/MusicPlayerDaemon/MPD/commit/0aeda01ba6d22a8d9fc583faa67ffc6473869a43

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

          substituteInPlace \

            src/lib/yajl/Callbacks.hxx \

            src/lib/yajl/Handle.hxx \

            --replace-fail "<yajl_parse.h>" "<yajl/yajl_parse.h>"

          substituteInPlace \

            src/lib/yajl/Gen.hxx \

            --replace-fail "<yajl_gen.h>" "<yajl/yajl_gen.h>"

        ''

        +

        lib.optionalString

          (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "12.0")

          ''
@@ -272,7 +260,8 @@ let 
        ++ map (x: "-D${x}=enabled") features_

        ++ map (x: "-D${x}=disabled") (lib.subtractLists features_ knownFeatures)

        ++ lib.optional (builtins.elem "zeroconf" features_) "-Dzeroconf=avahi"

        ++ lib.optional (builtins.elem "systemd" features_) "-Dsystemd_system_unit_dir=etc/systemd/system";

        ++ lib.optional (builtins.elem "systemd" features_) "-Dsystemd_system_unit_dir=etc/systemd/system"

        ++ lib.optional (builtins.elem "qobuz" features_) "-Dnlohmann_json=enabled";



      passthru.tests.nixos = nixosTests.mpd;
@@ -321,9 +310,7 @@ in 
        "id3tag"

        "expat"

        "pcre"

        "yajl"

        "sqlite"

        "soundcloud"

        "qobuz"

      ]

      ++ lib.optionals stdenv.hostPlatform.isLinux [