From da2d1c17dca630dcf59596929315c49a846439c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Mon, 25 May 2015 10:49:54 +0800 Subject: [PATCH] glfw: Update to 3.1.1 and build shared library. --- pkgs/development/libraries/glfw/3.x.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index ab7e312762fc..087be3bb6de0 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,16 +1,23 @@ -{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11 }: +{ stdenv, fetchurl, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, x11 +, libXinerama, libXcursor +}: stdenv.mkDerivation rec { - name = "glfw-3.0.4"; + name = "glfw-3.1.1"; src = fetchurl { url = "mirror://sourceforge/glfw/${name}.tar.bz2"; - sha256 = "1h7g16ncgkl38w19x4dvnn17k9j0kqfvbb9whw9qc71lkq5xf2ag"; + sha256 = "0q9dhbj2az7jwwi556zai0qr8zmg6d2lyxcqngppkw0x7hi1d1aa"; }; enableParallelBuilding = true; - buildInputs = [ cmake mesa libXrandr libXi libXxf86vm libXfixes x11 ]; + buildInputs = [ + cmake mesa libXrandr libXi libXxf86vm libXfixes x11 + libXinerama libXcursor + ]; + + 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";