prboom: Don't use crossAttrs

This commit is contained in:
John Ericson 2018-07-23 17:27:03 -04:00
parent 3470fa196d
commit ef93b82d43

View File

@ -1,20 +1,31 @@
{stdenv, fetchurl, SDL, SDL_mixer, SDL_net, libGLU_combined}: { stdenv, fetchurl, SDL, SDL_mixer, SDL_net
, libGLU_combined ? assert false; null
, useOpenGL ? stdenv.hostPlatform == stdenv.buildPlatform
}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "prboom-2.5.0"; name = "prboom-2.5.0";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/prboom/prboom-2.5.0.tar.gz; url = mirror://sourceforge/prboom/prboom-2.5.0.tar.gz;
sha256 = "1bjb04q8dk232956k30qlpq6q0hxb904yh1nflr87jcc1x3iqv12"; sha256 = "1bjb04q8dk232956k30qlpq6q0hxb904yh1nflr87jcc1x3iqv12";
}; };
buildInputs = [ SDL SDL_mixer SDL_net libGLU_combined ]; buildInputs = [ SDL SDL_mixer SDL_net ]
crossAttrs = { ++ stdenv.lib.optional useOpenGL libGLU_combined;
propagatedBuildInputs = [ SDL.crossDrv SDL_mixer.crossDrv SDL_net.crossDrv ];
configureFlags = "--disable-gl --disable-cpu-opt --without-x --disable-sdltest
ac_cv_type_uid_t=yes ac_cv_type_gid_t=yes";
postInstall = '' doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
mv $out/games/ $out/bin
''; configureFlags = [
}; (stdenv.lib.enableFeature useOpenGL "gl")
(stdenv.lib.enableFeature doCheck "sdltest")
] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"--disable-cpu-opt"
"--without-x"
"ac_cv_type_uid_t=yes"
"ac_cv_type_gid_t=yes"
];
postInstall = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
mv $out/games/ $out/bin
'';
} }