openra: migrate to pkgs/by-name

This commit is contained in:
magicquark
2026-07-06 02:15:57 +01:00
parent 2ef54b3bc3
commit 9b9845f36d
11 changed files with 22 additions and 19 deletions
@@ -0,0 +1,14 @@
{
callPackage,
}:
let
openRaUpdater = callPackage ../updater.nix { };
buildOpenRAEngine = callPackage ../build-engine.nix { inherit openRaUpdater; };
callPackage' = path: callPackage path { inherit buildOpenRAEngine; };
in
{
engines = {
release = callPackage' ./release;
bleed = callPackage' ./bleed;
};
}
+4
View File
@@ -0,0 +1,4 @@
{
openraPackages,
}:
openraPackages.engines.release
@@ -1,17 +1,17 @@
if [[ -z "${UPDATE_NIX_ATTR_PATH:-}" ]]; then
echo "Missing UPDATE_NIX_ATTR_PATH - make sure you use mainters/scripts/update.nix to run this script!" 1>&2
echo "Missing UPDATE_NIX_ATTR_PATH - make sure you use maintainers/scripts/update.nix to run this script!" 1>&2
exit 1
fi
attrPath="$UPDATE_NIX_ATTR_PATH"
nixFilePath="$(pwd)/pkgs/games/openra/engines/$build/default.nix"
nixFilePath="$(pwd)/pkgs/by-name/op/openra/engines/$build/default.nix"
if [[ ! -f "$nixFilePath" ]]; then
echo "$nixFilePath does not exist!" 1>&2
exit 1
fi
depsFilePath="$(pwd)/pkgs/games/openra/engines/$build/deps.json"
depsFilePath="$(pwd)/pkgs/by-name/op/openra/engines/$build/deps.json"
if [[ ! -f "$depsFilePath" ]]; then
echo "$depsFilePath does not exist!" 1>&2
exit 1
-13
View File
@@ -1,13 +0,0 @@
{ callPackage }:
let
openRaUpdater = callPackage ./updater.nix { };
buildOpenRAEngine = callPackage ./build-engine.nix { inherit openRaUpdater; };
callPackage' = path: callPackage path { inherit buildOpenRAEngine; };
in
{
engines = {
release = callPackage' ./engines/release;
bleed = callPackage' ./engines/bleed;
};
}
+1 -3
View File
@@ -10108,9 +10108,7 @@ with pkgs;
openra_2019 = openraPackages_2019.engines.release;
openraPackages = recurseIntoAttrs (callPackage ../games/openra { });
openra = openraPackages.engines.release;
openraPackages = recurseIntoAttrs (callPackage ../by-name/op/openra/engines { });
papermcServers = callPackages ../games/papermc { };