Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 82af060040c4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5f6f75fcec8a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 7, 2019

  1. glfw: 3.2.1 -> 3.3

    @Twey
    Twey authored and Jon committed Nov 7, 2019
    Copy the full SHA
    5f6f75f View commit details
Showing with 6 additions and 5 deletions.
  1. +6 −5 pkgs/development/libraries/glfw/3.x.nix
11 changes: 6 additions & 5 deletions pkgs/development/libraries/glfw/3.x.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
@@ -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" ];
@@ -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;
};
}