openarena: fix make flags, cleanup

+22 -19
+12
pkgs/games/openarena/Makefile.local
···
··· 1 + BUILD_CLIENT=1 2 + BUILD_RENDERER_OPENGL2=1 3 + BUILD_SERVER=1 4 + USE_CURL_DLOPEN=0 5 + USE_FREETYPE=1 6 + USE_INTERNAL_SPEEX=0 7 + USE_INTERNAL_JPEG=0 8 + USE_INTERNAL_OGG=0 9 + USE_INTERNAL_OPUS=0 10 + USE_INTERNAL_ZLIB=0 11 + USE_OPENAL_DLOPEN=0 12 + USE_RENDERER_DLOPEN=0
+10 -19
pkgs/games/openarena/default.nix
··· 10 , which 11 , freetype 12 , libglvnd 13 , libogg 14 , libvorbis 15 , libxmp ··· 25 url = "https://download.tuxfamily.org/openarena/rel/088/openarena-0.8.8.zip"; 26 hash = "sha256-Rup1n14k9sKcyVFYzFqPYV+BEBCnUNwpnFsnyGrhl20="; 27 }; 28 29 - openarena-source = fetchFromGitHub { 30 name = "openarena-source"; 31 owner = "OpenArena"; 32 repo = "engine"; 33 rev = "075cb860a4d2bc43e75e5f506eba7da877708aba"; 34 hash = "sha256-ofQKQyS3ti5TSN+zqwPFYuJiB9kvdER6zTWn8yrOpQU="; 35 }; 36 - in 37 - stdenv.mkDerivation (finalAttrs: { 38 - pname = "openarena"; 39 - version = "unstable-2023-03-02"; 40 - 41 - srcs = [ 42 - openarena-source 43 - openarena-maps 44 - ]; 45 - 46 - sourceRoot = "openarena-source"; 47 48 patches = [ 49 # Fix Makefile `copyFiles` target ··· 65 buildInputs = [ 66 freetype 67 libglvnd 68 libogg 69 libvorbis 70 libxmp ··· 75 76 enableParallelBuilding = true; 77 78 - makeFlags = [ 79 - "USE_INTERNAL_LIBS=0" 80 - "USE_FREETYPE=1" 81 - "USE_OPENAL_DLOPEN=0" 82 - "USE_CURL_DLOPEN=0" 83 - "ARCH=${stdenv.hostPlatform.linuxArch}" 84 - ]; 85 86 installTargets = [ "copyfiles" ]; 87 installFlags = [ "COPYDIR=$(out)/share/openarena" ];
··· 10 , which 11 , freetype 12 , libglvnd 13 + , libjpeg 14 , libogg 15 , libvorbis 16 , libxmp ··· 26 url = "https://download.tuxfamily.org/openarena/rel/088/openarena-0.8.8.zip"; 27 hash = "sha256-Rup1n14k9sKcyVFYzFqPYV+BEBCnUNwpnFsnyGrhl20="; 28 }; 29 + in 30 + stdenv.mkDerivation (finalAttrs: { 31 + pname = "openarena"; 32 + version = "unstable-2023-03-02"; 33 34 + src = fetchFromGitHub { 35 name = "openarena-source"; 36 owner = "OpenArena"; 37 repo = "engine"; 38 rev = "075cb860a4d2bc43e75e5f506eba7da877708aba"; 39 hash = "sha256-ofQKQyS3ti5TSN+zqwPFYuJiB9kvdER6zTWn8yrOpQU="; 40 }; 41 42 patches = [ 43 # Fix Makefile `copyFiles` target ··· 59 buildInputs = [ 60 freetype 61 libglvnd 62 + libjpeg 63 libogg 64 libvorbis 65 libxmp ··· 70 71 enableParallelBuilding = true; 72 73 + preConfigure = '' 74 + cp ${./Makefile.local} ./Makefile.local 75 + ''; 76 77 installTargets = [ "copyfiles" ]; 78 installFlags = [ "COPYDIR=$(out)/share/openarena" ];