Unverified Commit 695cae92 authored by K900's avatar K900 Committed by GitHub
Browse files

sdl3: don't propagate build inputs (#390062)

parents 027c4420 fb6fcd4e

pkgs/by-name/sd/sdl2-compat/package.nix

+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
  sdl3,

  stdenv,

  testers,

  libX11,

  libGL,

  testSupport ? true,

}:
@@ -35,6 +37,11 @@ stdenv.mkDerivation (finalAttrs: { 


  buildInputs = [

    sdl3

    libX11

  ];



  checkInputs = [

    libGL

  ];



  outputs = [

pkgs/by-name/sd/sdl3/package.nix

+5 −12
Original line number Diff line number Diff line
@@ -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 = {