Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

SDL2_{gfx,mixer,net,ttf}: fix Darwin build

+23 -11
+4 -2
pkgs/development/libraries/SDL2_gfx/default.nix
··· 1 - { stdenv, fetchurl, SDL2 }: 2 3 stdenv.mkDerivation rec { 4 name = "SDL2_gfx-${version}"; ··· 8 url = "mirror://sourceforge/sdl2gfx/${name}.tar.gz"; 9 sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn"; 10 }; 11 12 buildInputs = [ SDL2 ]; 13 ··· 38 license = licenses.zlib; 39 40 maintainers = with maintainers; [ bjg ]; 41 - platforms = platforms.linux; 42 }; 43 }
··· 1 + { stdenv, darwin, fetchurl, SDL2 }: 2 3 stdenv.mkDerivation rec { 4 name = "SDL2_gfx-${version}"; ··· 8 url = "mirror://sourceforge/sdl2gfx/${name}.tar.gz"; 9 sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn"; 10 }; 11 + 12 + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc; 13 14 buildInputs = [ SDL2 ]; 15 ··· 40 license = licenses.zlib; 41 42 maintainers = with maintainers; [ bjg ]; 43 + platforms = platforms.unix; 44 }; 45 }
+4 -1
pkgs/development/libraries/SDL2_mixer/default.nix
··· 1 { stdenv, lib, fetchurl, autoreconfHook, pkgconfig, which 2 , SDL2, libogg, libvorbis, smpeg2, flac, libmodplug 3 , enableNativeMidi ? false, fluidsynth ? null }: 4 5 stdenv.mkDerivation rec { ··· 17 18 nativeBuildInputs = [ autoreconfHook pkgconfig which ]; 19 20 propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ]; 21 22 configureFlags = [ "--disable-music-ogg-shared" ] ··· 24 25 meta = with stdenv.lib; { 26 description = "SDL multi-channel audio mixer library"; 27 - platforms = platforms.linux; 28 homepage = https://www.libsdl.org/projects/SDL_mixer/; 29 maintainers = with maintainers; [ MP2E ]; 30 license = licenses.zlib;
··· 1 { stdenv, lib, fetchurl, autoreconfHook, pkgconfig, which 2 , SDL2, libogg, libvorbis, smpeg2, flac, libmodplug 3 + , CoreServices, AudioUnit, AudioToolbox 4 , enableNativeMidi ? false, fluidsynth ? null }: 5 6 stdenv.mkDerivation rec { ··· 18 19 nativeBuildInputs = [ autoreconfHook pkgconfig which ]; 20 21 + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; 22 + 23 propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ]; 24 25 configureFlags = [ "--disable-music-ogg-shared" ] ··· 27 28 meta = with stdenv.lib; { 29 description = "SDL multi-channel audio mixer library"; 30 + platforms = platforms.unix; 31 homepage = https://www.libsdl.org/projects/SDL_mixer/; 32 maintainers = with maintainers; [ MP2E ]; 33 license = licenses.zlib;
+4 -2
pkgs/development/libraries/SDL2_net/default.nix
··· 1 - { stdenv, fetchurl, SDL2 }: 2 3 stdenv.mkDerivation rec { 4 name = "SDL2_net-${version}"; ··· 9 sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; 10 }; 11 12 propagatedBuildInputs = [ SDL2 ]; 13 14 meta = with stdenv.lib; { ··· 16 homepage = https://www.libsdl.org/projects/SDL_net; 17 license = licenses.zlib; 18 maintainers = with maintainers; [ MP2E ]; 19 - platforms = platforms.linux; 20 }; 21 }
··· 1 + { stdenv, darwin, fetchurl, SDL2 }: 2 3 stdenv.mkDerivation rec { 4 name = "SDL2_net-${version}"; ··· 9 sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; 10 }; 11 12 + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc; 13 + 14 propagatedBuildInputs = [ SDL2 ]; 15 16 meta = with stdenv.lib; { ··· 18 homepage = https://www.libsdl.org/projects/SDL_net; 19 license = licenses.zlib; 20 maintainers = with maintainers; [ MP2E ]; 21 + platforms = platforms.unix; 22 }; 23 }
+4 -2
pkgs/development/libraries/SDL2_ttf/default.nix
··· 1 - { stdenv, fetchurl, SDL2, freetype, mesa_noglu }: 2 3 stdenv.mkDerivation rec { 4 name = "SDL2_ttf-${version}"; ··· 9 sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"; 10 }; 11 12 buildInputs = [ SDL2 freetype mesa_noglu ]; 13 14 meta = with stdenv.lib; { 15 description = "SDL TrueType library"; 16 - platforms = platforms.linux; 17 license = licenses.zlib; 18 homepage = https://www.libsdl.org/projects/SDL_ttf/; 19 };
··· 1 + { stdenv, darwin, fetchurl, SDL2, freetype, mesa_noglu }: 2 3 stdenv.mkDerivation rec { 4 name = "SDL2_ttf-${version}"; ··· 9 sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"; 10 }; 11 12 + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc; 13 + 14 buildInputs = [ SDL2 freetype mesa_noglu ]; 15 16 meta = with stdenv.lib; { 17 description = "SDL TrueType library"; 18 + platforms = platforms.unix; 19 license = licenses.zlib; 20 homepage = https://www.libsdl.org/projects/SDL_ttf/; 21 };
+4 -3
pkgs/development/libraries/smpeg2/default.nix
··· 1 - { stdenv, fetchsvn, autoconf, automake, libtool, m4, pkgconfig, makeWrapper, SDL2 }: 2 3 stdenv.mkDerivation rec { 4 name = "smpeg2-svn${version}"; ··· 15 ./sdl2.patch 16 ]; 17 18 - nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ]; 19 20 buildInputs = [ SDL2 ]; 21 ··· 37 homepage = http://icculus.org/smpeg/; 38 description = "SDL2 MPEG Player Library"; 39 license = licenses.lgpl2; 40 - platforms = platforms.linux; 41 maintainers = with maintainers; [ orivej ]; 42 }; 43 }
··· 1 + { stdenv, darwin, fetchsvn, autoconf, automake, libtool, m4, pkgconfig, makeWrapper, SDL2 }: 2 3 stdenv.mkDerivation rec { 4 name = "smpeg2-svn${version}"; ··· 15 ./sdl2.patch 16 ]; 17 18 + nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ] 19 + ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; 20 21 buildInputs = [ SDL2 ]; 22 ··· 38 homepage = http://icculus.org/smpeg/; 39 description = "SDL2 MPEG Player Library"; 40 license = licenses.lgpl2; 41 + platforms = platforms.unix; 42 maintainers = with maintainers; [ orivej ]; 43 }; 44 }
+3 -1
pkgs/top-level/all-packages.nix
··· 10961 inherit (darwin.apple_sdk.frameworks) Foundation; 10962 }; 10963 10964 - SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { }; 10965 10966 SDL2_net = callPackage ../development/libraries/SDL2_net { }; 10967
··· 10961 inherit (darwin.apple_sdk.frameworks) Foundation; 10962 }; 10963 10964 + SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { 10965 + inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; 10966 + }; 10967 10968 SDL2_net = callPackage ../development/libraries/SDL2_net { }; 10969