Merge pull request #144092 from alyssais/sdl2

SDL2_*: fix cross
This commit is contained in:
Guillaume Girol 2021-11-02 20:22:49 +00:00 committed by GitHub
commit a72f1d2095
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 4 deletions

View file

@ -1,4 +1,4 @@
{ lib, stdenv, darwin, fetchurl, SDL2 }:
{ lib, stdenv, darwin, fetchurl, pkg-config, SDL2 }:
stdenv.mkDerivation rec {
pname = "SDL2_gfx";
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ SDL2 ]
++ lib.optional stdenv.isDarwin darwin.libobjc;

View file

@ -1,4 +1,7 @@
{ lib, stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation }:
{ lib, stdenv, fetchurl
, pkg-config
, SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation
}:
stdenv.mkDerivation rec {
pname = "SDL2_image";
@ -9,6 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ SDL2 libpng libjpeg libtiff giflib libwebp libXpm zlib ]
++ lib.optional stdenv.isDarwin Foundation;

View file

@ -1,4 +1,4 @@
{ lib, stdenv, darwin, fetchurl, SDL2 }:
{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2 }:
stdenv.mkDerivation rec {
pname = "SDL2_net";
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optional stdenv.isDarwin darwin.libobjc;
configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, darwin, fetchurl, SDL2, freetype, libGL }:
{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, libGL }:
stdenv.mkDerivation rec {
pname = "SDL2_ttf";
@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ SDL2 freetype libGL ]
++ lib.optional stdenv.isDarwin darwin.libobjc;