philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge pull request #125688 from fortuneteller2k/mpd 

mpd: 0.22.6 -> 0.22.8
master
Luke Granger-Brown 2021-06-06 20:11:15 +01:00 committed by GitHub
parent 6d3d57a20d 2af57b784f
commit dc8af36c45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/mpd/default.nix
View File

@ -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

6
pkgs/top-level/all-packages.nix
View File

@ -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 { };