talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

SDL2_mixer: fix configure warnings (#402066)

Browse Source
This commit is contained in:
Peder Bergebakken Sundt 2025-04-27 02:14:41 +02:00 committed by GitHub
commit 9b8ba51f55
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/by-name/sd/SDL2_mixer/package.nix
View File

@ -1,7 +1,6 @@
{ {
lib, lib,
SDL2, SDL2,
darwin,
fetchFromGitHub, fetchFromGitHub,
flac, flac,
fluidsynth, fluidsynth,
@ -14,14 +13,12 @@
smpeg2, smpeg2,
stdenv, stdenv,
timidity, timidity,
wavpack,
libxmp,
game-music-emu,
# Boolean flags # Boolean flags
enableSdltest ? (!stdenv.hostPlatform.isDarwin), enableSdltest ? (!stdenv.hostPlatform.isDarwin),
enableSmpegtest ? (!stdenv.hostPlatform.isDarwin),
}: }:
let
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "SDL2_mixer"; pname = "SDL2_mixer";
version = "2.8.1"; version = "2.8.1";
@ -38,12 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config pkg-config
]; ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
AudioToolbox
AudioUnit
CoreServices
];
propagatedBuildInputs = [ propagatedBuildInputs = [
SDL2 SDL2
flac flac
@ -54,6 +45,9 @@ stdenv.mkDerivation (finalAttrs: {
mpg123 mpg123
opusfile opusfile
smpeg2 smpeg2
wavpack
libxmp
game-music-emu
# MIDI patterns # MIDI patterns
timidity timidity
]; ];
@ -66,14 +60,11 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true; strictDeps = true;
configureFlags = [ configureFlags = [
(lib.enableFeature false "music-ogg-shared")
(lib.enableFeature false "music-flac-shared")
(lib.enableFeature false "music-mod-modplug-shared") (lib.enableFeature false "music-mod-modplug-shared")
(lib.enableFeature false "music-mp3-mpg123-shared") (lib.enableFeature false "music-mp3-mpg123-shared")
(lib.enableFeature false "music-opus-shared") (lib.enableFeature false "music-opus-shared")
(lib.enableFeature false "music-midi-fluidsynth-shared") (lib.enableFeature false "music-midi-fluidsynth-shared")
(lib.enableFeature enableSdltest "sdltest") (lib.enableFeature enableSdltest "sdltest")
(lib.enableFeature enableSmpegtest "smpegtest")
# override default path to allow MIDI files to be played # override default path to allow MIDI files to be played
(lib.withFeatureAs true "timidity-cfg" "${timidity}/share/timidity/timidity.cfg") (lib.withFeatureAs true "timidity-cfg" "${timidity}/share/timidity/timidity.cfg")
]; ];

4
pkgs/development/python-modules/pygame-ce/default.nix
View File

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