pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #310532 from kiike/pr/mpg321

authored by Franz Pletz and committed by GitHub ece972dc 776fc4d6

+2 -57
unified split
-53
pkgs/applications/audio/mpg321/default.nix
··· 1 - {lib, stdenv, fetchurl, fetchpatch, libao, libmad, libid3tag, zlib, alsa-lib 2 - # Specify default libao output plugin to use (e.g. "alsa", "pulse" …). 3 - # If null, it will use the libao system default. 4 - , defaultAudio ? null 5 - }: 6 - 7 - stdenv.mkDerivation rec { 8 - pname = "mpg321"; 9 - version = "0.3.2"; 10 - 11 - src = fetchurl { 12 - url = "mirror://sourceforge/mpg321/${version}/mpg321_${version}.orig.tar.gz"; 13 - sha256 = "0ki8mh76bbmdh77qsiw682dvi8y468yhbdabqwg05igmwc1wqvq5"; 14 - }; 15 - 16 - patches = [ 17 - (fetchpatch { 18 - name = "CVE-2018-7263.patch"; 19 - url = "https://sources.debian.org/data/main/m/mpg321/0.3.2-3/debian/patches/handle_illegal_bitrate_value.patch"; 20 - sha256 = "15simp5fjvm9b024ryfh441rkh2d5bcrizqkzlrh07n9sm7fkw6x"; 21 - }) 22 - # Apple defines semun already. Skip redefining it to fix build errors. 23 - (fetchpatch { 24 - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/85fa66a9/mpg321/0.3.2.patch"; 25 - sha256 = "sha256-qFYpKpE9PZSzOJrnsQINZi6FvUVX0anRyOvlF5eOYqE="; 26 - }) 27 - ]; 28 - 29 - hardeningDisable = [ "format" ]; 30 - 31 - # Workaround build failure on -fno-common toolchains like upstream 32 - # gcc-10. Otherwise build fails as: 33 - # ld: volume.o:/build/mpg321-0.3.2-orig/mpg321.h:119: multiple definition of 34 - # `loop_remaining'; mpg321.o:/build/mpg321-0.3.2-orig/mpg321.h:119: first defined here 35 - env.NIX_CFLAGS_COMPILE = "-fcommon"; 36 - 37 - configureFlags = 38 - [ ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) ] 39 - ++ (lib.optional (defaultAudio != null) 40 - "--with-default-audio=${defaultAudio}"); 41 - 42 - buildInputs = [libao libid3tag libmad zlib] 43 - ++ lib.optional stdenv.isLinux alsa-lib; 44 - 45 - installTargets = [ "install" "install-man" ]; 46 - 47 - meta = with lib; { 48 - description = "Command-line MP3 player"; 49 - homepage = "https://mpg321.sourceforge.net/"; 50 - license = licenses.gpl2; 51 - platforms = platforms.unix; 52 - }; 53 - }
···
+1 -2
pkgs/development/libraries/libmad/default.nix
··· 7 # for passthru.tests 8 , audacity 9 , mpd 10 - , mpg321 11 , normalize 12 , ocamlPackages 13 , streamripper ··· 70 preConfigure = "autoconf"; 71 72 passthru.tests = { 73 - inherit audacity mpd mpg321 normalize streamripper vlc; 74 ocaml-mad = ocamlPackages.mad; 75 }; 76
··· 7 # for passthru.tests 8 , audacity 9 , mpd 10 , normalize 11 , ocamlPackages 12 , streamripper ··· 69 preConfigure = "autoconf"; 70 71 passthru.tests = { 72 + inherit audacity mpd normalize streamripper vlc; 73 ocaml-mad = ocamlPackages.mad; 74 }; 75
+1
pkgs/top-level/aliases.nix
··· 826 mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 827 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 828 mpd_clientlib = libmpdclient; # Added 2021-02-11 829 mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2023-09-10 830 murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2023-09-10 831 mutt-with-sidebar = mutt; # Added 2022-09-17
··· 826 mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 827 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 828 mpd_clientlib = libmpdclient; # Added 2021-02-11 829 + mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10 830 mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2023-09-10 831 murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2023-09-10 832 mutt-with-sidebar = mutt; # Added 2022-09-17
-2
pkgs/top-level/all-packages.nix
··· 32936 withConplay = false; 32937 }; 32938 32939 - mpg321 = callPackage ../applications/audio/mpg321 { }; 32940 - 32941 mpc-cli = callPackage ../applications/audio/mpc { 32942 inherit (python3Packages) sphinx; 32943 };
··· 32936 withConplay = false; 32937 }; 32938 32939 mpc-cli = callPackage ../applications/audio/mpc { 32940 inherit (python3Packages) sphinx; 32941 };