From 98ef62e51a0e14fb836f00667832a208c16a8c80 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 27 Sep 2017 23:28:36 +0300 Subject: [PATCH] glfw3: cleanup dependencies, propagate mesa_noglu --- pkgs/development/libraries/glfw/3.x.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 52673061b72..c10b3c05986 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper -, libXinerama, libXcursor +{ stdenv, lib, fetchFromGitHub, cmake, mesa_noglu, libXrandr, libXinerama, libXcursor, libX11 , darwin, fixDarwinDylibNames }: @@ -16,12 +15,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ - cmake mesa libXrandr libXi libXxf86vm libXfixes xlibsWrapper - libXinerama libXcursor - ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel fixDarwinDylibNames ]); + propagatedBuildInputs = [ mesa_noglu ]; - cmakeFlags = "-DBUILD_SHARED_LIBS=ON"; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + libX11 libXrandr libXinerama libXcursor + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel fixDarwinDylibNames ]); + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";