public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

quake3wrapper: split from quake3demo, make a function and fix multiple paks

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-01-04 15:36:49 +03:00
parent 6b447a3c9b
commit 5981fc4b6f
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/games/quake3/wrapper/builder.sh
View File

@ -2,8 +2,8 @@ source $stdenv/setup
mkdir -p $out/baseq3 mkdir -p $out/baseq3
for i in $paks; do for i in $paks; do
if test -d "$paks/baseq3"; then if test -d "$i/baseq3"; then
ln -s $paks/baseq3/* $out/baseq3/ ln -s "$i/baseq3"/* $out/baseq3/
fi fi
done done

14
pkgs/games/quake3/wrapper/default.nix
View File

@ -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 { stdenv.mkDerivation {
name = "${name}-${ioquake3.name}";
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [makeWrapper]; nativeBuildInputs = [ makeWrapper ];
inherit game paks mesa name; inherit paks mesa;
game = ioquake3;
gcc = stdenv.cc.cc; gcc = stdenv.cc.cc;
preferLocalBuild = true;
meta = { meta = {
inherit description; inherit description;

7
pkgs/top-level/all-packages.nix
View File

@ -14256,10 +14256,11 @@ let
qqwing = callPackage ../games/qqwing { }; qqwing = callPackage ../games/qqwing { };
quake3demo = callPackage ../games/quake3/wrapper { quake3wrapper = callPackage ../games/quake3/wrapper { };
name = "quake3-demo-${ioquake3.name}";
quake3demo = quake3wrapper {
name = "quake3-demo-${lib.getVersion quake3demodata}";
description = "Demo of Quake 3 Arena, a classic first-person shooter"; description = "Demo of Quake 3 Arena, a classic first-person shooter";
game = ioquake3;
paks = [ quake3pointrelease quake3demodata ]; paks = [ quake3pointrelease quake3demodata ];
}; };