From 4014b24ca167a087384b0ccbed88df4538dcc577 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Sun, 21 Jan 2018 00:26:21 +0900 Subject: [PATCH] SDL2_{gfx,mixer,net,ttf}: fix Darwin build --- pkgs/development/libraries/SDL2_gfx/default.nix | 6 ++++-- pkgs/development/libraries/SDL2_mixer/default.nix | 5 ++++- pkgs/development/libraries/SDL2_net/default.nix | 6 ++++-- pkgs/development/libraries/SDL2_ttf/default.nix | 6 ++++-- pkgs/development/libraries/smpeg2/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 4 +++- 6 files changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index a7ef0290734..d3c868cb3bd 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2 }: +{ stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { name = "SDL2_gfx-${version}"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn"; }; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc; + buildInputs = [ SDL2 ]; configureFlags = if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx"; @@ -38,6 +40,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; maintainers = with maintainers; [ bjg ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 6eada0c83e5..00251adb915 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, autoreconfHook, pkgconfig, which , SDL2, libogg, libvorbis, smpeg2, flac, libmodplug +, CoreServices, AudioUnit, AudioToolbox , enableNativeMidi ? false, fluidsynth ? null }: stdenv.mkDerivation rec { @@ -17,6 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig which ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; + propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ]; configureFlags = [ "--disable-music-ogg-shared" ] @@ -24,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library"; - platforms = platforms.linux; + platforms = platforms.unix; homepage = https://www.libsdl.org/projects/SDL_mixer/; maintainers = with maintainers; [ MP2E ]; license = licenses.zlib; diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index cf81fc0cac8..ad6232406b0 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2 }: +{ stdenv, darwin, fetchurl, SDL2 }: stdenv.mkDerivation rec { name = "SDL2_net-${version}"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; }; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc; + propagatedBuildInputs = [ SDL2 ]; meta = with stdenv.lib; { @@ -16,6 +18,6 @@ stdenv.mkDerivation rec { homepage = https://www.libsdl.org/projects/SDL_net; license = licenses.zlib; maintainers = with maintainers; [ MP2E ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 010ca46695a..d691d6dfa1d 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, freetype, mesa_noglu }: +{ stdenv, darwin, fetchurl, SDL2, freetype, mesa_noglu }: stdenv.mkDerivation rec { name = "SDL2_ttf-${version}"; @@ -9,11 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"; }; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc; + buildInputs = [ SDL2 freetype mesa_noglu ]; meta = with stdenv.lib; { description = "SDL TrueType library"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.zlib; homepage = https://www.libsdl.org/projects/SDL_ttf/; }; diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix index 10386a7b33e..83660e042fc 100644 --- a/pkgs/development/libraries/smpeg2/default.nix +++ b/pkgs/development/libraries/smpeg2/default.nix @@ -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 { name = "smpeg2-svn${version}"; @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { ./sdl2.patch ]; - nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; buildInputs = [ SDL2 ]; @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { homepage = http://icculus.org/smpeg/; description = "SDL2 MPEG Player Library"; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bb89e9b67c..8db63bcd3c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10961,7 +10961,9 @@ with pkgs; 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 { };