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

treewide: Get rid of libGLU_combined

Browse Source
This commit is contained in:
adisbladis
2019-11-18 20:10:43 +00:00
parent e6963bc983
commit c9d8624ccd
241 changed files with 518 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/enblend-enfuse/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libGLU_combined, vigra
, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libGLU, libGL, 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 libGLU_combined vigra ];
buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU libGL 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, libGLU_combined, xorg }:
{stdenv, fetchgit, cmake, libGLU, libGL, xorg }:
stdenv.mkDerivation rec {
pname = "glee";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ libGLU_combined xorg.libX11 ];
buildInputs = [ libGLU libGL xorg.libX11 ];
configureScript = ''
cmake
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
, libGLU_combined, boost, glm, freetype }:
, libGLU, libGL, boost, glm, freetype }:
stdenv.mkDerivation rec {
pname = "logstalgia";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU_combined boost
buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL boost
glm freetype ];
meta = with stdenv.lib; {
pkgs/tools/graphics/pfstools/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig, darwin
, openexr, zlib, imagemagick, libGLU_combined, freeglut, fftwFloat
, openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat
, fftw, gsl, libexif, perl, opencv, qt5, netpbm
}:
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [
OpenGL GLUT
]) else [
libGLU_combined freeglut
libGLU libGL freeglut
]);
patches = [ ./threads.patch ./pfstools.patch ./pfsalign.patch ];