pyrox.dev / nixpkgs
lol
fork atom

openarena: fix make flags, cleanup

Pol Dellaiera 2da80dbf 8f1e7645

+22 -19
unified split
+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 10 , which 11 11 , freetype 12 12 , libglvnd 13 + , libjpeg 13 14 , libogg 14 15 , libvorbis 15 16 , libxmp ··· 25 26 url = "https://download.tuxfamily.org/openarena/rel/088/openarena-0.8.8.zip"; 26 27 hash = "sha256-Rup1n14k9sKcyVFYzFqPYV+BEBCnUNwpnFsnyGrhl20="; 27 28 }; 29 + in 30 + stdenv.mkDerivation (finalAttrs: { 31 + pname = "openarena"; 32 + version = "unstable-2023-03-02"; 28 33 29 - openarena-source = fetchFromGitHub { 34 + src = fetchFromGitHub { 30 35 name = "openarena-source"; 31 36 owner = "OpenArena"; 32 37 repo = "engine"; 33 38 rev = "075cb860a4d2bc43e75e5f506eba7da877708aba"; 34 39 hash = "sha256-ofQKQyS3ti5TSN+zqwPFYuJiB9kvdER6zTWn8yrOpQU="; 35 40 }; 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 41 48 42 patches = [ 49 43 # Fix Makefile `copyFiles` target ··· 65 59 buildInputs = [ 66 60 freetype 67 61 libglvnd 62 + libjpeg 68 63 libogg 69 64 libvorbis 70 65 libxmp ··· 75 70 76 71 enableParallelBuilding = true; 77 72 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 - ]; 73 + preConfigure = '' 74 + cp ${./Makefile.local} ./Makefile.local 75 + ''; 85 76 86 77 installTargets = [ "copyfiles" ]; 87 78 installFlags = [ "COPYDIR=$(out)/share/openarena" ];