sdl3: don't propagate build inputs

This commit is contained in:
Marcin Serwin
2025-03-15 09:14:35 +01:00
parent 6607cf789e
commit fb6fcd4e85
2 changed files with 12 additions and 12 deletions
+7
View File
@@ -14,6 +14,8 @@
sdl3,
stdenv,
testers,
libX11,
libGL,
testSupport ? true,
}:
@@ -35,6 +37,11 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
sdl3
libX11
];
checkInputs = [
libGL
];
outputs = [
+5 -12
View File
@@ -137,12 +137,8 @@ stdenv.mkDerivation (finalAttrs: {
xorg.libXfixes
xorg.libXi
xorg.libXrandr
];
propagatedBuildInputs = finalAttrs.dlopenPropagatedBuildInputs;
dlopenPropagatedBuildInputs =
[
]
++ [
vulkan-headers
vulkan-loader
]
@@ -176,12 +172,9 @@ stdenv.mkDerivation (finalAttrs: {
env = {
# Many dependencies are not directly linked to, but dlopen()'d at runtime. Adding them to the RPATH
# helps them be found
NIX_LDFLAGS =
lib.optionalString
(stdenv.hostPlatform.hasSharedLibraries && stdenv.hostPlatform.extensions.sharedLibrary == ".so")
"-rpath ${
lib.makeLibraryPath (finalAttrs.dlopenBuildInputs ++ finalAttrs.dlopenPropagatedBuildInputs)
}";
NIX_LDFLAGS = lib.optionalString (
stdenv.hostPlatform.hasSharedLibraries && stdenv.hostPlatform.extensions.sharedLibrary == ".so"
) "-rpath ${lib.makeLibraryPath (finalAttrs.dlopenBuildInputs)}";
};
passthru = {