From ccff7afc7968f18357c34f9ab5814f56c118a4ff Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 17 Sep 2022 11:20:46 +0800 Subject: [PATCH 1/2] SDL_compat: 1.2.52 -> 1.2.56 --- pkgs/development/libraries/SDL_compat/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/SDL_compat/default.nix b/pkgs/development/libraries/SDL_compat/default.nix index be88ddd95fd5..d2c9958b9c28 100644 --- a/pkgs/development/libraries/SDL_compat/default.nix +++ b/pkgs/development/libraries/SDL_compat/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , SDL2 @@ -19,25 +18,15 @@ let in stdenv.mkDerivation rec { pname = "SDL_compat"; - version = "1.2.52"; + version = "1.2.56"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "sdl12-compat"; rev = "release-" + version; - hash = "sha256-PDGlMI8q74JaqMQ5oX9Zt5CEr7frFQWECbuwq5g25eg="; + hash = "sha256-qd+hdJygJ+D2Ult6kmhUJmoPjasOFnBziTI8QtNiclI="; }; - patches = optionals stdenv.hostPlatform.isDarwin [ - # Fix broken install name in dylib, https://github.com/libsdl-org/sdl12-compat/issues/194 - # Remove when bump > 1.2.52 - (fetchpatch { - name = "SDL_compat-fix-install-name.patch"; - url = "https://github.com/libsdl-org/sdl12-compat/commit/5642d47ae489f2eb362cece2464ecc466a700ed5.patch"; - sha256 = "sha256-kQ5H8gXjTZVHHRF6UpgXKl3NIy87iULcc2iCsYt5Hqo="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config ]; propagatedBuildInputs = [ SDL2 ] From 2472a4484e86340246b7a13fff832712126c5899 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 17 Sep 2022 11:20:55 +0800 Subject: [PATCH 2/2] openxcom: fix missing dependency --- pkgs/games/openxcom/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 61f209aae4dc..661cf394e523 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , cmake +, pkg-config , libGLU , libGL , zlib @@ -25,7 +26,8 @@ stdenv.mkDerivation rec { hash = "sha256-APv49ZT94oeM4KVKGtUdoQ1t8Ly8lsocr+FqXiRXbk0="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp libGLU libGL openssl zlib ]; meta = with lib; {