Unverified Commit e5e4c3cb authored by Christian Kögler's avatar Christian Kögler Committed by GitHub
Browse files

Merge pull request #191600 from peterhoeg/u/sdl_compat 

SDL_compat: 1.2.52 -> 1.2.56
parents 0a1cc2f3 2472a448

pkgs/development/libraries/SDL_compat/default.nix

+2 −13
Original line number Diff line number Diff line 
{ 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 ]

pkgs/games/openxcom/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -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; {