Commit 245276a9 authored by Anderson Torres's avatar Anderson Torres
Browse files

SDL_classic: hide parameters under package expression

parent ad2899f1

pkgs/development/libraries/SDL/default.nix

+5 −2
Original line number Diff line number Diff line
@@ -5,16 +5,19 @@ 
, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid

, libXext, libICE, libXrandr

, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid && lib.meta.availableOn stdenv.hostPlatform libpulseaudio, libpulseaudio

, OpenGL, GLUT, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa

, darwin

}:



# NOTE: When editing this expression see if the same change applies to

# SDL2 expression too



let

  inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT;

  extraPropagatedBuildInputs = [ ]

    ++ lib.optionals x11Support [ libXext libICE libXrandr ]

    ++ lib.optionals (openglSupport && stdenv.isLinux) [ libGL libGLU ]

    ++ lib.optionals (openglSupport && stdenv.isLinux) [ libGL ]

    # libGLU doesn’t work with Android's SDL

    ++ lib.optionals (openglSupport && stdenv.isLinux && (!stdenv.hostPlatform.isAndroid)) [ libGLU ]

    ++ lib.optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ]

    ++ lib.optional alsaSupport alsa-lib

    ++ lib.optional pulseaudioSupport libpulseaudio

pkgs/top-level/all-packages.nix

+1 −6
Original line number Diff line number Diff line
@@ -23447,12 +23447,7 @@ with pkgs; 














  scope-lite = callPackage ../development/libraries/scope-lite { };



























  SDL_classic = callPackage ../development/libraries/SDL ({













    inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT;













  } // lib.optionalAttrs stdenv.hostPlatform.isAndroid {













    # libGLU doesn’t work with Android’s SDL













    libGLU = null;













  });













  SDL_classic = callPackage ../development/libraries/SDL { };





























  SDL = SDL_classic;