ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-18 03:04:32 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #250604 from NixOS/quake3-urbanterror-fix-preconfigure-phase

Browse Source 
{ioquake3, urbanterror}: fix `Makefile.local` creation and use, and align
This commit is contained in:
Pol Dellaiera 2023-08-22 06:47:39 +02:00 committed by GitHub
commit 46c03ec8ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/games/quake3/ioquake/Makefile.local Normal file
View File

@ -0,0 +1,6 @@
USE_CURL = 1
USE_CURL_DLOPEN = 0
USE_FREETYPE = 1
USE_INTERNAL_LIBS = 0
USE_OPENAL = 1
USE_OPENAL_DLOPEN = 0

6
pkgs/games/quake3/ioquake/default.nix
View File

@ -16,6 +16,7 @@
, libjpeg
, makeDesktopItem
, freetype
, mumble
}:
stdenv.mkDerivation {
@ -47,11 +48,14 @@ stdenv.mkDerivation {
libvorbis
libjpeg
freetype
mumble
];
enableParallelBuilding = true;
makeFlags = [ "USE_INTERNAL_LIBS=0" "USE_FREETYPE=1" "USE_OPENAL_DLOPEN=0" "USE_CURL_DLOPEN=0" ];
preConfigure = ''
cp ${./Makefile.local} ./Makefile.local
'';
installTargets = [ "copyfiles" ];

5
pkgs/games/urbanterror/Makefile.local Normal file
View File

@ -0,0 +1,5 @@
USE_CURL = 1
USE_CURL_DLOPEN = 0
USE_FREETYPE = 1
USE_OPENAL = 1
USE_OPENAL_DLOPEN = 0

11
pkgs/games/urbanterror/default.nix
View File

@ -56,15 +56,8 @@ stdenv.mkDerivation {
SDL
];
configurePhase = ''
runHook preConfigure
echo "USE_OPENAL = 1" > Makefile.local
echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local
echo "USE_CURL = 1" >> Makefile.local
echo "USE_CURL_DLOPEN = 0" >> Makefile.local
runHook postConfigure
preConfigure = ''
cp ${./Makefile.local} ./Makefile.local
'';
installTargets = [ "copyfiles" ];