dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #251809 from NixOS/openarena/cleanup

Browse Source 
openarena: fix make flags, cleanup
This commit is contained in:
Pol Dellaiera 2023-08-28 09:57:48 +02:00 committed by GitHub
commit 26fd41d810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/games/openarena/Makefile.local Normal file
View File

@ -0,0 +1,12 @@
BUILD_CLIENT=1
BUILD_RENDERER_OPENGL2=1
BUILD_SERVER=1
USE_CURL_DLOPEN=0
USE_FREETYPE=1
USE_INTERNAL_SPEEX=0
USE_INTERNAL_JPEG=0
USE_INTERNAL_OGG=0
USE_INTERNAL_OPUS=0
USE_INTERNAL_ZLIB=0
USE_OPENAL_DLOPEN=0
USE_RENDERER_DLOPEN=0

29
pkgs/games/openarena/default.nix
View File

@ -10,6 +10,7 @@
, which , which
, freetype , freetype
, libglvnd , libglvnd
, libjpeg
, libogg , libogg
, libvorbis , libvorbis
, libxmp , libxmp
@ -25,25 +26,18 @@ let
url = "https://download.tuxfamily.org/openarena/rel/088/openarena-0.8.8.zip"; url = "https://download.tuxfamily.org/openarena/rel/088/openarena-0.8.8.zip";
hash = "sha256-Rup1n14k9sKcyVFYzFqPYV+BEBCnUNwpnFsnyGrhl20="; hash = "sha256-Rup1n14k9sKcyVFYzFqPYV+BEBCnUNwpnFsnyGrhl20=";
}; };
in
stdenv.mkDerivation (finalAttrs: {
pname = "openarena";
version = "unstable-2023-03-02";
openarena-source = fetchFromGitHub { src = fetchFromGitHub {
name = "openarena-source"; name = "openarena-source";
owner = "OpenArena"; owner = "OpenArena";
repo = "engine"; repo = "engine";
rev = "075cb860a4d2bc43e75e5f506eba7da877708aba"; rev = "075cb860a4d2bc43e75e5f506eba7da877708aba";
hash = "sha256-ofQKQyS3ti5TSN+zqwPFYuJiB9kvdER6zTWn8yrOpQU="; hash = "sha256-ofQKQyS3ti5TSN+zqwPFYuJiB9kvdER6zTWn8yrOpQU=";
}; };
in
stdenv.mkDerivation (finalAttrs: {
pname = "openarena";
version = "unstable-2023-03-02";
srcs = [
openarena-source
openarena-maps
];
sourceRoot = "openarena-source";
patches = [ patches = [
# Fix Makefile `copyFiles` target # Fix Makefile `copyFiles` target
@ -65,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ buildInputs = [
freetype freetype
libglvnd libglvnd
libjpeg
libogg libogg
libvorbis libvorbis
libxmp libxmp
@ -75,13 +70,9 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true; enableParallelBuilding = true;
makeFlags = [ preConfigure = ''
"USE_INTERNAL_LIBS=0" cp ${./Makefile.local} ./Makefile.local
"USE_FREETYPE=1" '';
"USE_OPENAL_DLOPEN=0"
"USE_CURL_DLOPEN=0"
"ARCH=${stdenv.hostPlatform.linuxArch}"
];
installTargets = [ "copyfiles" ]; installTargets = [ "copyfiles" ];
installFlags = [ "COPYDIR=$(out)/share/openarena" ]; installFlags = [ "COPYDIR=$(out)/share/openarena" ];