git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #144092 from alyssais/sdl2

SDL2_*: fix cross

commita72f1d209514470de70936887b284fa753306d4a authorGuillaume Girol <symphorien@users.noreply.github.com> dateTue 2 Nov 2021, 20:22 (5 years ago) parent91a780b255413b
4 files changed+15−4
compare with master
unifiedsplit
pkgs/development/libraries/SDL2_gfx/default.nix+3−1 pkgs/development/libraries/SDL2_image/default.nix+6−1 pkgs/development/libraries/SDL2_net/default.nix+3−1 pkgs/development/libraries/SDL2_ttf/default.nix+3−1
pkgs/development/libraries/SDL2_gfx/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, darwin, fetchurl, SDL2 }:
1+{ lib, stdenv, darwin, fetchurl, pkg-config, SDL2 }:
22
33stdenv.mkDerivation rec {
44 pname = "SDL2_gfx";
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
99 sha256 = "0qk2ax7f7grlxb13ba0ll3zlm8780s7j8fmrhlpxzjgdvldf1q33";
1010 };
1111
12+ nativeBuildInputs = [ pkg-config ];
13+
1214 buildInputs = [ SDL2 ]
1315 ++ lib.optional stdenv.isDarwin darwin.libobjc;
1416
pkgs/development/libraries/SDL2_image/default.nix+6−1
@@ -1,4 +1,7 @@
1−{ lib, stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation }:
1+{ lib, stdenv, fetchurl
2+, pkg-config
3+, SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation
4+}:
25
36stdenv.mkDerivation rec {
47 pname = "SDL2_image";
@@ -9,6 +12,8 @@ stdenv.mkDerivation rec {
912 sha256 = "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx";
1013 };
1114
15+ nativeBuildInputs = [ pkg-config ];
16+
1217 buildInputs = [ SDL2 libpng libjpeg libtiff giflib libwebp libXpm zlib ]
1318 ++ lib.optional stdenv.isDarwin Foundation;
1419
pkgs/development/libraries/SDL2_net/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, darwin, fetchurl, SDL2 }:
1+{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2 }:
22
33stdenv.mkDerivation rec {
44 pname = "SDL2_net";
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
99 sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm";
1010 };
1111
12+ nativeBuildInputs = [ pkg-config ];
13+
1214 buildInputs = lib.optional stdenv.isDarwin darwin.libobjc;
1315
1416 configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
pkgs/development/libraries/SDL2_ttf/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, darwin, fetchurl, SDL2, freetype, libGL }:
1+{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, libGL }:
22
33stdenv.mkDerivation rec {
44 pname = "SDL2_ttf";
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
1111
1212 configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
1313
14+ nativeBuildInputs = [ pkg-config ];
15+
1416 buildInputs = [ SDL2 freetype libGL ]
1517 ++ lib.optional stdenv.isDarwin darwin.libobjc;
1618