diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2023-08-27 18:25:49 +0200 |
|---|---|---|
| committer | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2023-08-27 18:25:49 +0200 |
| commit | 2da80dbfbacf47ba1a9070c4855d68e5d52a339f (patch) | |
| tree | 2cb7045bf5c954eae5c0cb43142137e706c6062b /pkgs/games/openarena | |
| parent | 8f1e76455141194a9a68b9a201b914d741a5cfdf (diff) | |
| download | nixpkgs-2da80dbfbacf47ba1a9070c4855d68e5d52a339f.tar nixpkgs-2da80dbfbacf47ba1a9070c4855d68e5d52a339f.tar.gz nixpkgs-2da80dbfbacf47ba1a9070c4855d68e5d52a339f.tar.bz2 nixpkgs-2da80dbfbacf47ba1a9070c4855d68e5d52a339f.tar.lz nixpkgs-2da80dbfbacf47ba1a9070c4855d68e5d52a339f.tar.xz nixpkgs-2da80dbfbacf47ba1a9070c4855d68e5d52a339f.tar.zst nixpkgs-2da80dbfbacf47ba1a9070c4855d68e5d52a339f.zip | |
openarena: fix make flags, cleanup
Diffstat (limited to 'pkgs/games/openarena')
| -rw-r--r-- | pkgs/games/openarena/Makefile.local | 12 | ||||
| -rw-r--r-- | pkgs/games/openarena/default.nix | 29 |
2 files changed, 22 insertions, 19 deletions
diff --git a/pkgs/games/openarena/Makefile.local b/pkgs/games/openarena/Makefile.local new file mode 100644 index 00000000000..2055770f14b --- /dev/null +++ b/pkgs/games/openarena/Makefile.local @@ -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 diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix index 30f221902f7..7ae0111cfe4 100644 --- a/pkgs/games/openarena/default.nix +++ b/pkgs/games/openarena/default.nix @@ -10,6 +10,7 @@ , which , freetype , libglvnd +, libjpeg , libogg , libvorbis , libxmp @@ -25,25 +26,18 @@ let url = "https://download.tuxfamily.org/openarena/rel/088/openarena-0.8.8.zip"; hash = "sha256-Rup1n14k9sKcyVFYzFqPYV+BEBCnUNwpnFsnyGrhl20="; }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "openarena"; + version = "unstable-2023-03-02"; - openarena-source = fetchFromGitHub { + src = fetchFromGitHub { name = "openarena-source"; owner = "OpenArena"; repo = "engine"; rev = "075cb860a4d2bc43e75e5f506eba7da877708aba"; hash = "sha256-ofQKQyS3ti5TSN+zqwPFYuJiB9kvdER6zTWn8yrOpQU="; }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "openarena"; - version = "unstable-2023-03-02"; - - srcs = [ - openarena-source - openarena-maps - ]; - - sourceRoot = "openarena-source"; patches = [ # Fix Makefile `copyFiles` target @@ -65,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ freetype libglvnd + libjpeg libogg libvorbis libxmp @@ -75,13 +70,9 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - makeFlags = [ - "USE_INTERNAL_LIBS=0" - "USE_FREETYPE=1" - "USE_OPENAL_DLOPEN=0" - "USE_CURL_DLOPEN=0" - "ARCH=${stdenv.hostPlatform.linuxArch}" - ]; + preConfigure = '' + cp ${./Makefile.local} ./Makefile.local + ''; installTargets = [ "copyfiles" ]; installFlags = [ "COPYDIR=$(out)/share/openarena" ]; |