mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 15:43:00 +00:00
haskellPackages.SDL-image: fix build on darwin
Interestingly SDL-image exhibits both the problems of SDL-mixer and SDL-ttf have. How the respective fixes we apply here as well work is explained in 1a68ebf98573291fc4a8d8e7b35ea2e74a0d6665 and 2a8105fc58644307007f326de25b357d216d3ad7.
This commit is contained in:
parent
e41518821d
commit
0e0fbc6760
@ -206,6 +206,18 @@ self: super: {
|
|||||||
'' + (drv.postPatch or "");
|
'' + (drv.postPatch or "");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
SDL-image = overrideCabal super.SDL-image (drv: {
|
||||||
|
# Prevent darwin-specific configuration code path being taken
|
||||||
|
# which doesn't work with nixpkgs' SDL libraries
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace configure --replace xDarwin noDarwinSpecialCasing
|
||||||
|
'' + (drv.postPatch or "");
|
||||||
|
patches = [
|
||||||
|
# Work around SDL_main.h redefining main to SDL_main
|
||||||
|
./patches/SDL-image-darwin-hsc.patch
|
||||||
|
];
|
||||||
|
});
|
||||||
|
|
||||||
# Prevent darwin-specific configuration code path being taken which
|
# Prevent darwin-specific configuration code path being taken which
|
||||||
# doesn't work with nixpkgs' SDL libraries
|
# doesn't work with nixpkgs' SDL libraries
|
||||||
SDL-mixer = overrideCabal super.SDL-mixer (drv: {
|
SDL-mixer = overrideCabal super.SDL-mixer (drv: {
|
||||||
|
@ -0,0 +1,9 @@
|
|||||||
|
--- SDL-image-0.6.2.0/Graphics/UI/SDL/Image/Version.hsc.orig 2021-08-06 01:21:05.000000000 +0200
|
||||||
|
+++ SDL-image-0.6.2.0/Graphics/UI/SDL/Image/Version.hsc 2021-08-06 01:21:56.000000000 +0200
|
||||||
|
@@ -1,4 +1,6 @@
|
||||||
|
#include "SDL_image.h"
|
||||||
|
+-- override SDL_main.h redefining main to SDL_main on darwin
|
||||||
|
+#define main main
|
||||||
|
module Graphics.UI.SDL.Image.Version
|
||||||
|
( compiledFor
|
||||||
|
, linkedWith
|
Loading…
Reference in New Issue
Block a user