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

SDL2_{gfx,mixer,net,ttf}: move libobjc to buildInputs

Browse Source
This commit is contained in:
Mitsuhiro Nakamura 2018-01-21 06:57:44 +09:00
parent 4014b24ca1
commit bd57ec3870
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,9 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn";
};
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
buildInputs = [ SDL2 ];
buildInputs = [ SDL2 ]
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
configureFlags = if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx";

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

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm";
};
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
propagatedBuildInputs = [ SDL2 ];

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

@ -9,9 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl";
};
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
buildInputs = [ SDL2 freetype mesa_noglu ];
buildInputs = [ SDL2 freetype mesa_noglu ]
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
meta = with stdenv.lib; {
description = "SDL TrueType library";

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

@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
./sdl2.patch
];
nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ]
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ];
buildInputs = [ SDL2 ];
buildInputs = [ SDL2 ]
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
preConfigure = ''
sh autogen.sh