From b2871a6ca8cfb0e40f74bf004c0f292b9057a08b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 21 Aug 2023 21:59:55 +0200 Subject: [PATCH 1/2] ioquake3: fix `preConfigure` phase Using `makeFlags` doesn't do anything, using the local `Makefile.local` is actually working. --- pkgs/games/quake3/ioquake/Makefile.local | 6 ++++++ pkgs/games/quake3/ioquake/default.nix | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 pkgs/games/quake3/ioquake/Makefile.local diff --git a/pkgs/games/quake3/ioquake/Makefile.local b/pkgs/games/quake3/ioquake/Makefile.local new file mode 100644 index 000000000000..9f487970eabc --- /dev/null +++ b/pkgs/games/quake3/ioquake/Makefile.local @@ -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 diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index 7161b9474f24..437b99ae3439 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -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" ]; From 8f508af8dce8fa5145ef6562449564a6b583da1c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 21 Aug 2023 22:00:46 +0200 Subject: [PATCH 2/2] urbanterror: fix `configurePhase` phase Use `preConfigure` and external file instead. --- pkgs/games/urbanterror/Makefile.local | 5 +++++ pkgs/games/urbanterror/default.nix | 11 ++--------- 2 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 pkgs/games/urbanterror/Makefile.local diff --git a/pkgs/games/urbanterror/Makefile.local b/pkgs/games/urbanterror/Makefile.local new file mode 100644 index 000000000000..aee08a8ade79 --- /dev/null +++ b/pkgs/games/urbanterror/Makefile.local @@ -0,0 +1,5 @@ +USE_CURL = 1 +USE_CURL_DLOPEN = 0 +USE_FREETYPE = 1 +USE_OPENAL = 1 +USE_OPENAL_DLOPEN = 0 diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 6c54984eccbf..a1bf80784d03 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -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" ];