Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

glfw: 3.2.1 -> 3.3 #70626

Merged
merged 1 commit into from Nov 7, 2019
Merged

glfw: 3.2.1 -> 3.3 #70626

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions pkgs/development/libraries/glfw/3.x.nix
View file
Open in desktop
@@ -1,16 +1,17 @@
{ stdenv, lib, fetchFromGitHub, cmake, libGL, libXrandr, libXinerama, libXcursor, libX11
{ stdenv, lib, fetchFromGitHub, cmake
, libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext
, Cocoa, Kernel, fixDarwinDylibNames
}:

stdenv.mkDerivation rec {
version = "3.2.1";
version = "3.3";
pname = "glfw";

src = fetchFromGitHub {
owner = "glfw";
repo = "GLFW";
rev = version;
sha256 = "0gq6ad38b3azk0w2yy298yz2vmg2jmf9g0ydidqbmiswpk25ills";
sha256 = "1f1hqpqffzg46z33ybs2c3akmkly7b3qmgp5byk50nvad6g2pm4p";
};

enableParallelBuilding = true;
Expand All @@ -19,7 +20,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake ];

buildInputs = [ libX11 libXrandr libXinerama libXcursor ]
buildInputs = [ libX11 libXrandr libXinerama libXcursor libXi libXext ]
++ lib.optionals stdenv.isDarwin [ Cocoa Kernel fixDarwinDylibNames ];

cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
Expand All @@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
homepage = https://www.glfw.org/;
license = licenses.zlib;
maintainers = with maintainers; [ marcweber ];
maintainers = with maintainers; [ marcweber twey ];
platforms = platforms.unix;
};
}