diff options
author | OPNA2608 <christoph.neidahl@gmail.com> | 2021-08-16 17:40:03 +0200 |
---|---|---|
committer | OPNA2608 <christoph.neidahl@gmail.com> | 2021-08-16 22:40:13 +0200 |
commit | d416e6878c0cd46d2831b7a19398692978377ac7 (patch) | |
tree | f7ce3413c64d92aa68b0039104879d7b2b17664c | |
parent | 7b5d67fa60f6f6fc0139d12fb4ec8e68a3f7bef2 (diff) | |
download | nixpkgs-d416e6878c0cd46d2831b7a19398692978377ac7.tar nixpkgs-d416e6878c0cd46d2831b7a19398692978377ac7.tar.gz nixpkgs-d416e6878c0cd46d2831b7a19398692978377ac7.tar.bz2 nixpkgs-d416e6878c0cd46d2831b7a19398692978377ac7.tar.lz nixpkgs-d416e6878c0cd46d2831b7a19398692978377ac7.tar.xz nixpkgs-d416e6878c0cd46d2831b7a19398692978377ac7.tar.zst nixpkgs-d416e6878c0cd46d2831b7a19398692978377ac7.zip |
mpg123: Add audio support on Darwin
-rw-r--r-- | pkgs/applications/audio/mpg123/default.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 44788467d8f..09a588857e3 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -2,8 +2,10 @@ , fetchurl , makeWrapper , alsa-lib +, AudioUnit +, AudioToolbox , perl -, withConplay ? !stdenv.targetPlatform.isWindows +, withConplay ? !stdenv.hostPlatform.isWindows }: stdenv.mkDerivation rec { @@ -20,7 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optionals withConplay [ makeWrapper ]; buildInputs = lib.optionals withConplay [ perl ] - ++ lib.optionals (!stdenv.isDarwin && !stdenv.targetPlatform.isWindows) [ alsa-lib ]; + ++ lib.optionals (stdenv.hostPlatform.isLinux) [ alsa-lib ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ AudioUnit AudioToolbox ]; configureFlags = lib.optional (stdenv.hostPlatform ? mpg123) @@ -43,8 +46,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast console MPEG Audio Player and decoder library"; homepage = "https://mpg123.org"; - license = licenses.lgpl21; - maintainers = [ maintainers.ftrvxmtrx ]; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ ftrvxmtrx ]; platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d6d2b4248e..30bdd91c438 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26073,7 +26073,9 @@ with pkgs; mpc123 = callPackage ../applications/audio/mpc123 { }; - mpg123 = callPackage ../applications/audio/mpg123 { }; + mpg123 = callPackage ../applications/audio/mpg123 { + inherit (darwin.apple_sdk.frameworks) AudioUnit AudioToolbox; + }; mpg321 = callPackage ../applications/audio/mpg321 { }; |