From d9e295cdefe01ac9b447ac5b0b3c30978a2c972b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 23 May 2022 09:11:59 +0800 Subject: [PATCH] openxcom: build with SDL_compat --- pkgs/games/openxcom/default.nix | 34 ++++++++++++++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index b877c3aac2fd..61f209aae4dc 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -1,26 +1,38 @@ -{lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, zlib, openssl, libyamlcpp, boost -, SDL, SDL_image, SDL_mixer, SDL_gfx }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libGLU +, libGL +, zlib +, openssl +, libyamlcpp +, boost +, SDL +, SDL_image +, SDL_mixer +, SDL_gfx +}: -let version = "1.0.0.2019.10.18"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "openxcom"; - inherit version; + version = "1.0.0.2019.10.18"; + src = fetchFromGitHub { owner = "OpenXcom"; repo = "OpenXcom"; rev = "f9853b2cb8c8f741ac58707487ef493416d890a3"; - sha256 = "0kbfawj5wsp1mwfcm5mwpkq6s3d13pailjm5w268gqpxjksziyq0"; + hash = "sha256-APv49ZT94oeM4KVKGtUdoQ1t8Ly8lsocr+FqXiRXbk0="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp libGLU libGL openssl zlib ]; - meta = { + meta = with lib; { description = "Open source clone of UFO: Enemy Unknown"; homepage = "https://openxcom.org"; - maintainers = [ lib.maintainers.cpages ]; - platforms = lib.platforms.linux; - license = lib.licenses.gpl3; + maintainers = with maintainers; [ cpages ]; + platforms = platforms.linux; + license = licenses.gpl3; }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9d332acf927..7f86640f9c6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32033,7 +32033,7 @@ with pkgs; opentyrian = callPackage ../games/opentyrian { }; - openxcom = callPackage ../games/openxcom { }; + openxcom = callPackage ../games/openxcom { SDL = SDL_compat; }; openxray = callPackage ../games/openxray { };