diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-05-25 00:32:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-25 00:32:50 +0200 |
| commit | 934462ef8fd416627e233322a5b0ba1e2545c9f2 (patch) | |
| tree | c5186fdf85a017a4dbc0bd45e92f69b930d104e6 | |
| parent | b732baf859996d37db16d9c632a6f30605f5bfa4 (diff) | |
| parent | a35a56895415dc46b514ba30d9445f1800d9f72b (diff) | |
| download | nixpkgs-934462ef8fd416627e233322a5b0ba1e2545c9f2.tar nixpkgs-934462ef8fd416627e233322a5b0ba1e2545c9f2.tar.gz nixpkgs-934462ef8fd416627e233322a5b0ba1e2545c9f2.tar.bz2 nixpkgs-934462ef8fd416627e233322a5b0ba1e2545c9f2.tar.lz nixpkgs-934462ef8fd416627e233322a5b0ba1e2545c9f2.tar.xz nixpkgs-934462ef8fd416627e233322a5b0ba1e2545c9f2.tar.zst nixpkgs-934462ef8fd416627e233322a5b0ba1e2545c9f2.zip | |
Merge pull request #173994 from trofi/workaround-fno-common-for-mpg321
mpg321: add -fcommon workaround
| -rw-r--r-- | pkgs/applications/audio/mpg321/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index 593b837704a..08cfbada931 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -28,6 +28,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: volume.o:/build/mpg321-0.3.2-orig/mpg321.h:119: multiple definition of + # `loop_remaining'; mpg321.o:/build/mpg321-0.3.2-orig/mpg321.h:119: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + configureFlags = [ ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) ] ++ (lib.optional (defaultAudio != null) |