diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2021-06-06 20:11:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-06 20:11:15 +0100 |
| commit | dc8af36c452166046df5a30b668e79fbbee734c5 (patch) | |
| tree | e51cb7d672fe20b86a8198281c4e89fd442c4802 | |
| parent | 6d3d57a20d9a6530625733060d152911663fbe7d (diff) | |
| parent | 2af57b784f30d312d7a3f1a52e0503eb6123e436 (diff) | |
| download | nixlib-dc8af36c452166046df5a30b668e79fbbee734c5.tar nixlib-dc8af36c452166046df5a30b668e79fbbee734c5.tar.gz nixlib-dc8af36c452166046df5a30b668e79fbbee734c5.tar.bz2 nixlib-dc8af36c452166046df5a30b668e79fbbee734c5.tar.lz nixlib-dc8af36c452166046df5a30b668e79fbbee734c5.tar.xz nixlib-dc8af36c452166046df5a30b668e79fbbee734c5.tar.zst nixlib-dc8af36c452166046df5a30b668e79fbbee734c5.zip | |
Merge pull request #125688 from fortuneteller2k/mpd
mpd: 0.22.6 -> 0.22.8
| -rw-r--r-- | pkgs/servers/mpd/default.nix | 10 | ||||
| -rw-r--r-- | 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 3e1f81000046..56bf0ed5d2ff 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 c537b0545a37..b0ab5ac5ffbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19307,8 +19307,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 { }; |