quake3: move all the files into a set to make visible that they belong together

This also neatly avoids the warning by nipkgs-vet
This commit is contained in:
‮rekcäH nitraM‮ 2025-03-22 09:05:06 +01:00 committed by Martin Häcker
parent f59281f1c7
commit c89d34d772
2 changed files with 57 additions and 43 deletions

View file

@ -0,0 +1,46 @@
callPackage: rec {
# main entry point to create a runnable quake3
quake3wrapper = callPackage ./wrapper { };
# data files
quake3arenadata = callPackage ./content/arena.nix { };
quake3demodata = callPackage ./content/demo.nix { };
quake3pointrelease = callPackage ./content/pointrelease.nix { };
quake3hires = callPackage ./content/hires.nix { };
# runnable quakes with different configurations / mods
quake3arena = quake3wrapper {
pname = "quake3";
paks = [
quake3arenadata
quake3pointrelease
];
};
quake3arena-hires = quake3wrapper {
pname = "quake3";
paks = [
quake3arenadata
quake3pointrelease
quake3hires
];
};
quake3demo = quake3wrapper {
pname = "quake3-demo";
paks = [
quake3demodata
quake3pointrelease
];
};
quake3demo-hires = quake3wrapper {
pname = "quake3-demo";
paks = [
quake3demodata
quake3pointrelease
quake3hires
];
};
}

View file

@ -15173,49 +15173,17 @@ with pkgs;
protobuf = protobuf_21;
};
quake3wrapper = callPackage ../games/quake3/wrapper { };
quake3arena = quake3wrapper {
pname = "quake3";
paks = [
quake3arenadata
quake3pointrelease
];
};
quake3arena-hires = quake3wrapper {
pname = "quake3";
paks = [
quake3arenadata
quake3pointrelease
quake3hires
];
};
quake3demo = quake3wrapper {
pname = "quake3-demo";
paks = [
quake3demodata
quake3pointrelease
];
};
quake3demo-hires = quake3wrapper {
pname = "quake3-demo";
paks = [
quake3demodata
quake3pointrelease
quake3hires
];
};
quake3arenadata = callPackage ../games/quake3/content/arena.nix { };
quake3demodata = callPackage ../games/quake3/content/demo.nix { };
quake3pointrelease = callPackage ../games/quake3/content/pointrelease.nix { };
quake3hires = callPackage ../games/quake3/content/hires.nix { };
inherit (import ../games/quake3 pkgs.callPackage)
quake3wrapper
quake3arenadata
quake3demodata
quake3pointrelease
quake3arena
quake3arena-hires
quake3demo
quake3demo-hires
quake3hires
;
quakespasm = callPackage ../games/quakespasm { };
vkquake = callPackage ../games/quakespasm/vulkan.nix { };