diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix index 6d4507dc41ae..0aabebd3a9cf 100644 --- a/pkgs/by-name/sd/sdl2-compat/package.nix +++ b/pkgs/by-name/sd/sdl2-compat/package.nix @@ -14,6 +14,8 @@ sdl3, stdenv, testers, + libX11, + libGL, testSupport ? true, }: @@ -35,6 +37,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ sdl3 + libX11 + ]; + + checkInputs = [ + libGL ]; outputs = [ diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index fea18b66aed7..fcb105e9947e 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -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 = {