quake3wrapper: split from quake3demo, make a function and fix multiple paks
This commit is contained in:
parent
6b447a3c9b
commit
5981fc4b6f
@ -2,8 +2,8 @@ source $stdenv/setup
|
||||
|
||||
mkdir -p $out/baseq3
|
||||
for i in $paks; do
|
||||
if test -d "$paks/baseq3"; then
|
||||
ln -s $paks/baseq3/* $out/baseq3/
|
||||
if test -d "$i/baseq3"; then
|
||||
ln -s "$i/baseq3"/* $out/baseq3/
|
||||
fi
|
||||
done
|
||||
|
||||
|
@ -1,13 +1,21 @@
|
||||
{stdenv, fetchurl, game, paks, mesa, name, description, makeWrapper}:
|
||||
{ stdenv, fetchurl, mesa, ioquake3, makeWrapper }:
|
||||
|
||||
{ paks, name ? (stdenv.lib.head paks).name, description ? "" }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "${name}-${ioquake3.name}";
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
buildInputs = [makeWrapper];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
inherit game paks mesa name;
|
||||
inherit paks mesa;
|
||||
|
||||
game = ioquake3;
|
||||
|
||||
gcc = stdenv.cc.cc;
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
meta = {
|
||||
inherit description;
|
||||
|
@ -14256,10 +14256,11 @@ let
|
||||
|
||||
qqwing = callPackage ../games/qqwing { };
|
||||
|
||||
quake3demo = callPackage ../games/quake3/wrapper {
|
||||
name = "quake3-demo-${ioquake3.name}";
|
||||
quake3wrapper = callPackage ../games/quake3/wrapper { };
|
||||
|
||||
quake3demo = quake3wrapper {
|
||||
name = "quake3-demo-${lib.getVersion quake3demodata}";
|
||||
description = "Demo of Quake 3 Arena, a classic first-person shooter";
|
||||
game = ioquake3;
|
||||
paks = [ quake3pointrelease quake3demodata ];
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user