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

treewide: transition mesa to libGLU_combined

Browse Source
This commit is contained in:
Alexander V. Nikolaev
2018-02-24 17:06:49 +02:00
parent 1bc1909e5b
commit 0acec7e984
273 changed files with 572 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/asymptote/default.nix
+1 -1
View File
@@ -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 libGLU_combined_noglu.osmesa ]
++ stdenv.lib.optionals stdenv.isDarwin
(with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ])
;
pkgs/tools/graphics/enblend-enfuse/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, mesa, vigra
, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libGLU_combined, vigra
, help2man, pkgconfig, perl, texlive }:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0j5x011ilalb47ssah50ag0a4phgh1b0wdgxdbbp1gcyjcjf60w7";
};
buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff mesa vigra ];
buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU_combined vigra ];
nativeBuildInputs = [ help2man perl pkgconfig texlive.combined.scheme-small ];
pkgs/tools/graphics/glee/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchgit, cmake, mesa, xorg }:
{stdenv, fetchgit, cmake, libGLU_combined, xorg }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ mesa xorg.libX11 ];
buildInputs = [ libGLU_combined xorg.libX11 ];
configureScript = ''
cmake
pkgs/tools/graphics/glmark2/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, mesa, libdrm,
{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGLU_combined, libdrm,
python27, wayland, libudev }:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
libjpeg libpng xorg.libxcb libX11 mesa libdrm python27 wayland libudev
libjpeg libpng xorg.libxcb libX11 libGLU_combined libdrm python27 wayland libudev
];
buildPhase = ''
pkgs/tools/graphics/glxinfo/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
name = "glxinfo-${version}";
src = fetchurl {
url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2";
url = "ftp://ftp.freedesktop.org/pub/libGLU_combined/demos/${version}/mesa-demos-${version}.tar.bz2";
sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1";
};
pkgs/tools/graphics/logstalgia/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL2_image, glew
, mesa, boost, glm, freetype }:
, libGLU_combined, boost, glm, freetype }:
stdenv.mkDerivation rec {
name = "logstalgia-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image mesa boost
buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU_combined boost
glm freetype ];
meta = with stdenv.lib; {
pkgs/tools/graphics/maim/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig
, zlib, libpng, libjpeg
, mesa, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu }:
, libGLU_combined, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu }:
stdenv.mkDerivation rec {
name = "maim-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs =
[ zlib libpng libjpeg mesa glm libX11 libXext libXfixes libXrandr
[ zlib libpng libjpeg libGLU_combined glm libX11 libXext libXfixes libXrandr
libXcomposite slop icu ];
doCheck = false;
pkgs/tools/graphics/pfstools/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig
, openexr, zlib, imagemagick, mesa, freeglut, fftwFloat
, openexr, zlib, imagemagick, libGLU_combined, freeglut, fftwFloat
, fftw, gsl, libexif, perl, opencv, qt4
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
openexr zlib imagemagick mesa freeglut fftwFloat
openexr zlib imagemagick libGLU_combined freeglut fftwFloat
fftw gsl libexif perl opencv qt4
];