diff options
| author | Shawn8901 <shawn8901@googlemail.com> | 2023-01-26 18:31:02 +0100 |
|---|---|---|
| committer | Shawn8901 <shawn8901@googlemail.com> | 2023-01-26 18:31:02 +0100 |
| commit | a59dda942cbe3d40c1ae424d4d8a6db715cac0d5 (patch) | |
| tree | c4d7e17a260da0a29c9690de071787d3ca62b3d2 /pkgs/development/libraries/SDL | |
| parent | aedc95590cdc13e99441684b7aca81cdbfa542ad (diff) | |
treewide: remove global with lib; statements in pkgs/development
Diffstat (limited to 'pkgs/development/libraries/SDL')
| -rw-r--r-- | pkgs/development/libraries/SDL/default.nix | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 3a2a048a860e0..5299135e9fe48 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -11,17 +11,15 @@ # NOTE: When editing this expression see if the same change applies to # SDL2 expression too -with lib; - let extraPropagatedBuildInputs = [ ] - ++ optionals x11Support [ libXext libICE libXrandr ] - ++ optionals (openglSupport && stdenv.isLinux) [ libGL libGLU ] - ++ optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ] - ++ optional alsaSupport alsa-lib - ++ optional pulseaudioSupport libpulseaudio - ++ optional stdenv.isDarwin Cocoa; - rpath = makeLibraryPath extraPropagatedBuildInputs; + ++ lib.optionals x11Support [ libXext libICE libXrandr ] + ++ lib.optionals (openglSupport && stdenv.isLinux) [ libGL libGLU ] + ++ lib.optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ] + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional stdenv.isDarwin Cocoa; + rpath = lib.makeLibraryPath extraPropagatedBuildInputs; in stdenv.mkDerivation rec { @@ -40,13 +38,13 @@ stdenv.mkDerivation rec { outputBin = "dev"; # sdl-config nativeBuildInputs = [ pkg-config ] - ++ optional stdenv.isLinux libcap; + ++ lib.optional stdenv.isLinux libcap; propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs; buildInputs = [ ] - ++ optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile - ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; + ++ lib.optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile + ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; configureFlags = [ "--disable-oss" @@ -58,9 +56,9 @@ stdenv.mkDerivation rec { # SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) # # Please try revert the change that introduced this comment when updating SDL. - ] ++ optional stdenv.isDarwin "--disable-x11-shared" - ++ optional (!x11Support) "--without-x" - ++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"; + ] ++ lib.optional stdenv.isDarwin "--disable-x11-shared" + ++ lib.optional (!x11Support) "--without-x" + ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"; patches = [ ./find-headers.patch |