From 2e3077c9074b95204d5191718f1394e63ede0982 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 8 Mar 2018 11:21:04 +0000 Subject: [PATCH] SDL: propagate X11 libs even when building statically against them on Darwin Packages like SDL_image, SDL_mixer, SDL_net, SDL_ttf depend on this. This reverts a piece of 19130ebc5d05cc7720335c92d68a4fd1faf28dc0. --- pkgs/development/libraries/SDL/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 0b853aad8ef..534f31ad1f4 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ ] - ++ optionals (x11Support && !stdenv.isDarwin) [ libXext libICE libXrandr ] + ++ optionals x11Support [ libXext libICE libXrandr ] ++ optional stdenv.isLinux libcap ++ optionals openglSupport [ libGL libGLU ] ++ optional alsaSupport alsaLib @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { ++ optional stdenv.isDarwin Cocoa; buildInputs = [ libiconv ] - ++ optionals (x11Support && stdenv.isDarwin) [ libXext libICE libXrandr ] ++ optional (!hostPlatform.isMinGW) audiofile ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];