SDL2_{gfx,mixer,net,ttf}: move libobjc to buildInputs
This commit is contained in:
parent
4014b24ca1
commit
bd57ec3870
@ -9,9 +9,8 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn";
|
sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
|
buildInputs = [ SDL2 ]
|
||||||
|
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
|
||||||
buildInputs = [ SDL2 ];
|
|
||||||
|
|
||||||
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";
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm";
|
sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
|
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
|
||||||
|
|
||||||
propagatedBuildInputs = [ SDL2 ];
|
propagatedBuildInputs = [ SDL2 ];
|
||||||
|
|
||||||
|
@ -9,9 +9,8 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl";
|
sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
|
buildInputs = [ SDL2 freetype mesa_noglu ]
|
||||||
|
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
|
||||||
buildInputs = [ SDL2 freetype mesa_noglu ];
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "SDL TrueType library";
|
description = "SDL TrueType library";
|
||||||
|
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
|
|||||||
./sdl2.patch
|
./sdl2.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ]
|
nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ];
|
||||||
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
|
|
||||||
|
|
||||||
buildInputs = [ SDL2 ];
|
buildInputs = [ SDL2 ]
|
||||||
|
++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
sh autogen.sh
|
sh autogen.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user