From 2af57b784f30d312d7a3f1a52e0503eb6123e436 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Fri, 4 Jun 2021 22:37:27 +0800 Subject: [PATCH] mpd: 0.22.6 -> 0.22.8 --- pkgs/servers/mpd/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 3e1f8100004..56bf0ed5d2f 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, darwin +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost +# Darwin inputs +, AudioToolbox, AudioUnit # Inputs , curl, libmms, libnfs, liburing, samba # Archive support @@ -114,13 +116,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.22.6"; + version = "0.22.8"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-Xu+MxMxR5u++R3lZHe6UQ+mEmRnWbN6173ZX39KS1A8="; + sha256 = "sha256-nlUgFmiIrheN/FsSlQ/16iqwBXDw6xuwJG/foPZD07M="; }; buildInputs = [ @@ -133,7 +135,7 @@ let gtest ] ++ concatAttrVals features_ featureDependencies - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioToolbox darwin.apple_sdk.frameworks.AudioUnit ]; + ++ lib.optionals stdenv.isDarwin [ AudioToolbox AudioUnit ]; nativeBuildInputs = [ meson diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8294ff9ad8a..6d2ed9caae1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19281,8 +19281,10 @@ in mod_pkcs12 = pkgs.apacheHttpdPackages.mod_pkcs12; mod_timestamp = pkgs.apacheHttpdPackages.mod_timestamp; - inherit (callPackages ../servers/mpd { stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv; }) - mpd mpd-small mpdWithFeatures; + inherit (callPackages ../servers/mpd { + stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv; + inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit; + }) mpd mpd-small mpdWithFeatures; libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { };