diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-07-23 17:27:03 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-07-24 17:53:56 -0400 |
commit | ef93b82d433237a64ce2150ecffa46362cb4dbba (patch) | |
tree | c7333c790a514f7bc990eca135f19865b1712abd /pkgs/games/prboom | |
parent | 3470fa196d143beab2e7fdd5ba86887126990a4f (diff) | |
download | nixpkgs-ef93b82d433237a64ce2150ecffa46362cb4dbba.tar nixpkgs-ef93b82d433237a64ce2150ecffa46362cb4dbba.tar.gz nixpkgs-ef93b82d433237a64ce2150ecffa46362cb4dbba.tar.bz2 nixpkgs-ef93b82d433237a64ce2150ecffa46362cb4dbba.tar.lz nixpkgs-ef93b82d433237a64ce2150ecffa46362cb4dbba.tar.xz nixpkgs-ef93b82d433237a64ce2150ecffa46362cb4dbba.tar.zst nixpkgs-ef93b82d433237a64ce2150ecffa46362cb4dbba.zip |
prboom: Don't use crossAttrs
Diffstat (limited to 'pkgs/games/prboom')
-rw-r--r-- | pkgs/games/prboom/default.nix | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/pkgs/games/prboom/default.nix b/pkgs/games/prboom/default.nix index 4babc1caea5..520f6503edf 100644 --- a/pkgs/games/prboom/default.nix +++ b/pkgs/games/prboom/default.nix @@ -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"; src = fetchurl { url = mirror://sourceforge/prboom/prboom-2.5.0.tar.gz; sha256 = "1bjb04q8dk232956k30qlpq6q0hxb904yh1nflr87jcc1x3iqv12"; }; - buildInputs = [ SDL SDL_mixer SDL_net libGLU_combined ]; - crossAttrs = { - 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"; + buildInputs = [ SDL SDL_mixer SDL_net ] + ++ stdenv.lib.optional useOpenGL libGLU_combined; - postInstall = '' - mv $out/games/ $out/bin - ''; - }; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + + 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 + ''; } |