Merge remote-tracking branch 'origin/master' into gcc-9

2019-12-26 14:17:36 +01:00
parent 602bccd1a8 4d2dd15546
commit 77b6c3cd06
4311 changed files with 115681 additions and 107815 deletions
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, libelf, which, pkgconfig, freeglut
 , avrgcc, avrlibc
-, libGLU_combined
+, libGLU, libGL
 , GLUT }:

 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
  NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];

  nativeBuildInputs = [ which pkgconfig avrgcc ];
-  buildInputs = [ libelf freeglut libGLU_combined ]
+  buildInputs = [ libelf freeglut libGLU libGL ]
    ++ stdenv.lib.optional stdenv.isDarwin GLUT;

  # Hack to avoid TMPDIR in RPATHs.