Merge master into staging-next

2019-07-11 09:40:10 +02:00
parent 6049c39bdb 08b828d1c5
commit 22cb7f25f2
88 changed files with 460 additions and 323 deletions
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

  meta = with stdenv.lib; {
    description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
-    homepage = http://www.glfw.org/;
+    homepage = https://www.glfw.org/;
    license = licenses.zlib;
    maintainers = with maintainers; [ marcweber ];
    platforms = platforms.unix;