JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34089 from mnacamura/sdl2-darwin-fix

Browse Source 
SDL2_{gfx,mixer,net,ttf}: fix Darwin build
This commit is contained in:
Daiderd Jordan 2018-01-21 00:30:36 +01:00 committed by GitHub
commit 1fa5c8abae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/SDL2_gfx/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL2 }: { stdenv, darwin, fetchurl, SDL2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "SDL2_gfx-${version}"; name = "SDL2_gfx-${version}";
@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn"; sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn";
}; };
buildInputs = [ SDL2 ]; buildInputs = [ SDL2 ]
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
configureFlags = if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx"; configureFlags = if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx";
@ -38,6 +39,6 @@ stdenv.mkDerivation rec {
license = licenses.zlib; license = licenses.zlib;
maintainers = with maintainers; [ bjg ]; maintainers = with maintainers; [ bjg ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

5
pkgs/development/libraries/SDL2_mixer/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, which { stdenv, lib, fetchurl, autoreconfHook, pkgconfig, which
, SDL2, libogg, libvorbis, smpeg2, flac, libmodplug , SDL2, libogg, libvorbis, smpeg2, flac, libmodplug
, CoreServices, AudioUnit, AudioToolbox
, enableNativeMidi ? false, fluidsynth ? null }: , enableNativeMidi ? false, fluidsynth ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,6 +18,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig which ]; nativeBuildInputs = [ autoreconfHook pkgconfig which ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ];
propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ]; propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ];
configureFlags = [ "--disable-music-ogg-shared" ] configureFlags = [ "--disable-music-ogg-shared" ]
@ -24,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "SDL multi-channel audio mixer library"; description = "SDL multi-channel audio mixer library";
platforms = platforms.linux; platforms = platforms.unix;
homepage = https://www.libsdl.org/projects/SDL_mixer/; homepage = https://www.libsdl.org/projects/SDL_mixer/;
maintainers = with maintainers; [ MP2E ]; maintainers = with maintainers; [ MP2E ];
license = licenses.zlib; license = licenses.zlib;

6
pkgs/development/libraries/SDL2_net/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL2 }: { stdenv, darwin, fetchurl, SDL2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "SDL2_net-${version}"; name = "SDL2_net-${version}";
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm";
}; };
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
propagatedBuildInputs = [ SDL2 ]; propagatedBuildInputs = [ SDL2 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -16,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = https://www.libsdl.org/projects/SDL_net; homepage = https://www.libsdl.org/projects/SDL_net;
license = licenses.zlib; license = licenses.zlib;
maintainers = with maintainers; [ MP2E ]; maintainers = with maintainers; [ MP2E ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

7
pkgs/development/libraries/SDL2_ttf/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL2, freetype, mesa_noglu }: { stdenv, darwin, fetchurl, SDL2, freetype, mesa_noglu }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "SDL2_ttf-${version}"; name = "SDL2_ttf-${version}";
@ -9,11 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"; sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl";
}; };
buildInputs = [ SDL2 freetype mesa_noglu ]; buildInputs = [ SDL2 freetype mesa_noglu ]
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "SDL TrueType library"; description = "SDL TrueType library";
platforms = platforms.linux; platforms = platforms.unix;
license = licenses.zlib; license = licenses.zlib;
homepage = https://www.libsdl.org/projects/SDL_ttf/; homepage = https://www.libsdl.org/projects/SDL_ttf/;
}; };

7
pkgs/development/libraries/smpeg2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchsvn, autoconf, automake, libtool, m4, pkgconfig, makeWrapper, SDL2 }: { stdenv, darwin, fetchsvn, autoconf, automake, libtool, m4, pkgconfig, makeWrapper, SDL2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "smpeg2-svn${version}"; name = "smpeg2-svn${version}";
@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ]; nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ];
buildInputs = [ SDL2 ]; buildInputs = [ SDL2 ]
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
preConfigure = '' preConfigure = ''
sh autogen.sh sh autogen.sh
@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
homepage = http://icculus.org/smpeg/; homepage = http://icculus.org/smpeg/;
description = "SDL2 MPEG Player Library"; description = "SDL2 MPEG Player Library";
license = licenses.lgpl2; license = licenses.lgpl2;
platforms = platforms.linux; platforms = platforms.unix;
maintainers = with maintainers; [ orivej ]; maintainers = with maintainers; [ orivej ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -10961,7 +10961,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Foundation; inherit (darwin.apple_sdk.frameworks) Foundation;
}; };
SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { }; SDL2_mixer = callPackage ../development/libraries/SDL2_mixer {
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
};
SDL2_net = callPackage ../development/libraries/SDL2_net { }; SDL2_net = callPackage ../development/libraries/SDL2_net { };