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/tools/graphics/asymptote/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{stdenv, fetchurl
, freeglut, ghostscriptX, imagemagick, fftw
, boehmgc, mesa_glu, mesa_noglu, ncurses, readline, gsl, libsigsegv
, boehmgc, mesa_glu, libGL, ncurses, readline, gsl, libsigsegv
, python, zlib, perl, texLive, texinfo, xz
, darwin
}:
@@ -20,7 +20,7 @@ let
boehmgc ncurses readline gsl libsigsegv
python zlib perl texLive texinfo xz ]
++ stdenv.lib.optionals stdenv.isLinux
[ freeglut mesa_glu mesa_noglu mesa_noglu.osmesa ]
[ freeglut mesa_glu libGL mesa_noglu.osmesa ]
++ stdenv.lib.optionals stdenv.isDarwin
(with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ])
;
pkgs/tools/graphics/glxinfo/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, xlibsWrapper, mesa_noglu }:
{ stdenv, fetchurl, xlibsWrapper, libGL }:
let version = "8.3.0"; in
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1";
};
buildInputs = [ xlibsWrapper mesa_noglu ];
buildInputs = [ xlibsWrapper libGL ];
configurePhase = "true";