public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: transition from mesa_noglu to libGL

Browse Source
This commit is contained in:
Alexander V. Nikolaev
2018-02-24 17:03:46 +02:00
parent 8da9b485ec
commit 8f2a22935c
50 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/glfw/2.x.nix
+2 -2
View File
@@ -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
pkgs/development/libraries/glfw/3.x.nix
+2 -2
View File
@@ -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 ];