Merge pull request #259155 from fgaz/ft2/1.71

ft2-clone: 1.69 -> 1.71
This commit is contained in:
Francesco Gazzetta 2023-10-05 16:02:31 +00:00 committed by GitHub
commit bb5e76b6d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,5 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
, nixosTests , nixosTests
, alsa-lib , alsa-lib
@ -14,30 +13,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ft2-clone"; pname = "ft2-clone";
version = "1.69"; version = "1.71";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "8bitbubsy"; owner = "8bitbubsy";
repo = "ft2-clone"; repo = "ft2-clone";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-tm0yTh46UKnsjH9hv3cMW0YL2x3OTRL+14x4c7w124U="; hash = "sha256-c2gFq+TgTMI+Eld0z8hryLew3XkrQ7XAfq2s+zdEkBQ=";
}; };
patches = [
# Adapt CMake script to be Darwin-compatible
# https://github.com/8bitbubsy/ft2-clone/pull/30
(fetchpatch {
name = "0001-ft2-clone-Make-CMake-script-macOS-compatible.patch";
url = "https://github.com/8bitbubsy/ft2-clone/pull/30/commits/0033a567abf7ddbdb2bc59c7f730d22f986010aa.patch";
hash = "sha256-fhA+T6RI+Qmhr7mbG9lEA7esWskgK8+DkWzol0J2lUo=";
})
(fetchpatch {
name = "0002-ft2-clone-Fix-__MACOSX_CORE__-typo.patch";
url = "https://github.com/8bitbubsy/ft2-clone/pull/30/commits/fe50aff9233130150a6631875611c7db67a2d705.patch";
hash = "sha256-X4AVuJ0iRlpH1N/YzjdVk5+yv7eiDNoZkk0mhOizgOg=";
})
];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ SDL2 ] buildInputs = [ SDL2 ]
++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional stdenv.isLinux alsa-lib
@ -63,4 +47,3 @@ stdenv.mkDerivation rec {
platforms = platforms.littleEndian; platforms = platforms.littleEndian;
}; };
} }