diff options
| author | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 14:06:44 +0200 |
|---|---|---|
| committer | Alexander V. Nikolaev <avn@avnik.info> | 2018-02-24 17:03:46 +0200 |
| commit | 8f2a22935c31140891591ed3bb3e6baf230bc4f0 (patch) | |
| tree | 30cd829c96a4abaffff99dcc027eba0e2e064ef1 /pkgs/development/libraries/glfw | |
| parent | 8da9b485ec008c9c7c4adcfa604a289b3050c2c6 (diff) | |
treewide: transition from mesa_noglu to libGL
Diffstat (limited to 'pkgs/development/libraries/glfw')
| -rw-r--r-- | pkgs/development/libraries/glfw/2.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/glfw/3.x.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix index a017ff3d988c..a4f14c9a0147 100644 --- a/pkgs/development/libraries/glfw/2.x.nix +++ b/pkgs/development/libraries/glfw/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa_glu, mesa_noglu, libX11, libXext }: +{ stdenv, fetchurl, mesa_glu, libGL, libX11, libXext }: stdenv.mkDerivation rec { name = "glfw-2.7.9"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i"; }; - buildInputs = [ mesa_glu mesa_noglu libX11 libXext ]; + buildInputs = [ mesa_glu libGL libX11 libXext ]; buildPhase = '' make x11 diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index c10b3c05986a..8d4d4d10038a 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, mesa_noglu, libXrandr, libXinerama, libXcursor, libX11 +{ stdenv, lib, fetchFromGitHub, cmake, libGL, libXrandr, libXinerama, libXcursor, libX11 , darwin, fixDarwinDylibNames }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - propagatedBuildInputs = [ mesa_noglu ]; + propagatedBuildInputs = [ libGL ]; nativeBuildInputs = [ cmake ]; |