SDL_compat: use SDL3 through sdl2-compat (#386495)
This commit is contained in:
@@ -1,11 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
SDL2,
|
||||
sdl2-compat,
|
||||
cmake,
|
||||
darwin,
|
||||
fetchFromGitHub,
|
||||
libGLU,
|
||||
libiconv,
|
||||
libX11,
|
||||
mesa,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
@@ -38,8 +39,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
autoSignDarwinBinariesHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs =
|
||||
[ SDL2 ]
|
||||
buildInputs =
|
||||
[
|
||||
libX11
|
||||
sdl2-compat
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libiconv
|
||||
Cocoa
|
||||
@@ -67,14 +71,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
''
|
||||
install_name_tool ${
|
||||
lib.strings.concatMapStrings (
|
||||
x: " -add_rpath ${lib.makeLibraryPath [ x ]} "
|
||||
) finalAttrs.propagatedBuildInputs
|
||||
lib.strings.concatMapStrings (x: " -add_rpath ${lib.makeLibraryPath [ x ]} ") finalAttrs.buildInputs
|
||||
} "$lib"
|
||||
''
|
||||
else
|
||||
''
|
||||
patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath finalAttrs.propagatedBuildInputs}" "$lib"
|
||||
patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath finalAttrs.buildInputs}" "$lib"
|
||||
''
|
||||
}
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user