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

treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa

Browse Source 
Just use mesa for these to be more clear. Move these to aliases.nix
This commit is contained in:
Matthew Bauer
2019-06-17 14:43:18 -04:00
parent f7e2bb8cff
commit 263f5891b6
35 changed files with 79 additions and 82 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, fetchpatch
, freeglut, ghostscriptX, imagemagick, fftw
, boehmgc, libGLU, libGL, mesa_noglu, ncurses, readline, gsl, libsigsegv
, boehmgc, libGLU, libGL, mesa, 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 libGLU libGL mesa_noglu.osmesa ]
[ freeglut libGLU libGL mesa.osmesa ]
++ stdenv.lib.optionals stdenv.isDarwin
(with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ])
;
pkgs/tools/graphics/glmark2/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm,
python27, wayland, udev, mesa_noglu, wafHook }:
python27, wayland, udev, mesa, wafHook }:
stdenv.mkDerivation rec {
name = "glmark2-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [
libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa_noglu
libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa
];
wafConfigureFlags = ["--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2"];