Skip to content

SDL2_mixer: fix configure warnings #402066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pbsds merged 3 commits into from
Apr 27, 2025
Merged

SDL2_mixer: fix configure warnings #402066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40b9d94
SDL2_mixer: fix configure warnings
marcin-serwin Apr 26, 2025
8438878
python3Packages.pygame-ce: use latest SDL2_mixer
marcin-serwin Apr 26, 2025
a5e6bd6
SDL2_mixer: drop darwin deps
marcin-serwin Apr 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions pkgs/by-name/sd/SDL2_mixer/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
lib,
SDL2,
darwin,
fetchFromGitHub,
flac,
fluidsynth,
Expand All @@ -14,14 +13,12 @@
smpeg2,
stdenv,
timidity,
wavpack,
libxmp,
game-music-emu,
# Boolean flags
enableSdltest ? (!stdenv.hostPlatform.isDarwin),
enableSmpegtest ? (!stdenv.hostPlatform.isDarwin),
}:

let
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
in
stdenv.mkDerivation (finalAttrs: {
pname = "SDL2_mixer";
version = "2.8.1";
Expand All @@ -38,12 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
];

buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
AudioToolbox
AudioUnit
CoreServices
];

propagatedBuildInputs = [
SDL2
flac
Expand All @@ -54,6 +45,9 @@ stdenv.mkDerivation (finalAttrs: {
mpg123
opusfile
smpeg2
wavpack
libxmp
game-music-emu
# MIDI patterns
timidity
];
Expand All @@ -66,14 +60,11 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;

configureFlags = [
(lib.enableFeature false "music-ogg-shared")
(lib.enableFeature false "music-flac-shared")
(lib.enableFeature false "music-mod-modplug-shared")
(lib.enableFeature false "music-mp3-mpg123-shared")
(lib.enableFeature false "music-opus-shared")
(lib.enableFeature false "music-midi-fluidsynth-shared")
(lib.enableFeature enableSdltest "sdltest")
(lib.enableFeature enableSmpegtest "smpegtest")
# override default path to allow MIDI files to be played
(lib.withFeatureAs true "timidity-cfg" "${timidity}/share/timidity/timidity.cfg")
];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pygame-ce/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
portmidi,
SDL2_classic,
SDL2_classic_image,
SDL2_classic_mixer_2_0,
SDL2_classic_mixer,
SDL2_classic_ttf,
numpy,

Expand Down Expand Up @@ -101,7 +101,7 @@ buildPythonPackage rec {
portmidi
SDL2_classic
(SDL2_classic_image.override { enableSTB = false; })
SDL2_classic_mixer_2_0
SDL2_classic_mixer
SDL2_classic_ttf
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ];

Expand Down