Merge pull request #190170 from SuperSandro2000/mpd
This commit is contained in:
commit
2e85da905b
|
@ -1,4 +1,4 @@
|
|||
{lib, stdenv, fetchurl, zlib, gperf}:
|
||||
{ lib, stdenv, fetchurl, zlib, gperf_3_0 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libid3tag";
|
||||
|
@ -12,7 +12,11 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "dev" ];
|
||||
setOutputFlags = false;
|
||||
|
||||
propagatedBuildInputs = [ zlib gperf ];
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ gperf_3_0 ];
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
patches = [
|
||||
./debian-patches.patch
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, fmt
|
||||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, fmt, buildPackages
|
||||
# Darwin inputs
|
||||
, AudioToolbox, AudioUnit
|
||||
# Inputs
|
||||
|
@ -145,6 +145,8 @@ let
|
|||
]
|
||||
++ concatAttrVals features_ nativeFeatureDependencies;
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12.0") ''
|
||||
substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \
|
||||
--replace kAudioObjectPropertyElement{Main,Master} \
|
||||
|
|
|
@ -19807,9 +19807,7 @@ with pkgs;
|
|||
# On non-GNU systems we need GNU Gettext for libintl.
|
||||
libintl = if stdenv.hostPlatform.libc != "glibc" then gettext else null;
|
||||
|
||||
libid3tag = callPackage ../development/libraries/libid3tag {
|
||||
gperf = gperf_3_0;
|
||||
};
|
||||
libid3tag = callPackage ../development/libraries/libid3tag { };
|
||||
|
||||
libidn = callPackage ../development/libraries/libidn { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue