From cdfda72c650a072ee51083f78166f89801687580 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Fri, 24 Oct 2025 16:01:21 -0700 Subject: [PATCH] openxcom: move to by-name/ --- .../openxcom/default.nix => by-name/op/openxcom/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) rename pkgs/{games/openxcom/default.nix => by-name/op/openxcom/package.nix} (96%) diff --git a/pkgs/games/openxcom/default.nix b/pkgs/by-name/op/openxcom/package.nix similarity index 96% rename from pkgs/games/openxcom/default.nix rename to pkgs/by-name/op/openxcom/package.nix index e17ea01a0e8d..275c1191ef8c 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/by-name/op/openxcom/package.nix @@ -7,7 +7,7 @@ libGL, openssl, pkg-config, - SDL, + SDL_compat, SDL_image, SDL_mixer, SDL_gfx, @@ -36,7 +36,7 @@ stdenv.mkDerivation { boost libGL libGLU - SDL + SDL_compat SDL_gfx SDL_image SDL_mixer diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4009daf8a6dc..4cf105e26898 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13267,8 +13267,6 @@ with pkgs; openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix { }; openttd-nml = callPackage ../games/openttd/nml.nix { }; - openxcom = callPackage ../games/openxcom { SDL = SDL_compat; }; - openxray = callPackage ../games/openxray { # Builds with Clang, but hits an assertion failure unless GCC is used # https://github.com/OpenXRay/xray-16/issues/1224