Skip to content

Commit 71f899c

Browse files
vcunatvcunat
committed
Merge #34461: mesa -> libGL* rename
This will just bit rot otherwise. Almost nothing gets rebuilt.
2 parents 9b7d93e + 04c31a5 commit 71f899c

361 files changed

Lines changed: 830 additions & 799 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pkgs/applications/audio/fmit/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ stdenv, fetchFromGitHub, fftw, freeglut, mesa_glu, qtbase, qtmultimedia, qmake
1+
{ stdenv, fetchFromGitHub, fftw, freeglut, libGLU, qtbase, qtmultimedia, qmake
22
, alsaSupport ? true, alsaLib ? null
33
, jackSupport ? false, libjack2 ? null
44
, portaudioSupport ? false, portaudio ? null }:

‎pkgs/applications/audio/helm/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2
2-
, lv2, pkgconfig, mesa }:
2+
, lv2, pkgconfig, libGLU_combined }:
33

44
stdenv.mkDerivation rec {
55
version = "0.9.0";
@@ -15,7 +15,7 @@
1515
buildInputs = [
1616
xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
1717
xorg.libXinerama xorg.libXrender xorg.libXrandr
18-
freetype alsaLib curl libjack2 pkgconfig mesa lv2
18+
freetype alsaLib curl libjack2 pkgconfig libGLU_combined lv2
1919
];
2020

2121
CXXFLAGS = "-DHAVE_LROUND";

‎pkgs/applications/audio/jack-oscrolloscope/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ stdenv, fetchurl, SDL, libjack2, mesa, pkgconfig }:
1+
{ stdenv, fetchurl, SDL, libjack2, libGLU_combined, pkgconfig }:
22

33
stdenv.mkDerivation rec {
44
name = "jack_oscrolloscope-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010
};
1111

1212
nativeBuildInputs = [ pkgconfig ];
13-
buildInputs = [ SDL libjack2 mesa ];
13+
buildInputs = [ SDL libjack2 libGLU_combined ];
1414

1515
installPhase = ''
1616
mkdir -p $out/bin

‎pkgs/applications/audio/meters_lv2/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ stdenv, fetchurl, pkgconfig
2-
, lv2, mesa, gtk2, cairo, pango, fftw }:
2+
, lv2, libGLU_combined, gtk2, cairo, pango, fftw }:
33

44
let
55
version = "0.8.1";
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
2626
inherit name;
2727

2828
nativeBuildInputs = [ pkgconfig ];
29-
buildInputs = [ lv2 mesa gtk2 cairo pango fftw ];
29+
buildInputs = [ lv2 libGLU_combined gtk2 cairo pango fftw ];
3030

3131
srcs = [ src robtkSrc ];
3232
sourceRoot = name;

‎pkgs/applications/audio/pianobooster/default.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ stdenv, fetchurl, alsaLib, cmake, mesa, makeWrapper, qt4 }:
1+
{ stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }:
22

33
stdenv.mkDerivation rec {
44
name = "pianobooster-${version}";
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
1616

1717
preConfigure = "cd src";
1818

19-
buildInputs = [ alsaLib cmake makeWrapper mesa qt4 ];
19+
buildInputs = [ alsaLib cmake makeWrapper libGLU_combined qt4 ];
2020

2121
postInstall = ''
2222
wrapProgram $out/bin/pianobooster \
23-
--prefix LD_LIBRARY_PATH : ${mesa}/lib
23+
--prefix LD_LIBRARY_PATH : ${libGLU_combined}/lib
2424
'';
2525

2626
meta = with stdenv.lib; {

‎pkgs/applications/audio/setbfree/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ stdenv, fetchurl, alsaLib, freetype, ftgl, libjack2, libX11, lv2
2-
, mesa, pkgconfig, ttf_bitstream_vera
2+
, libGLU_combined, pkgconfig, ttf_bitstream_vera
33
}:
44

55
stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919

2020
nativeBuildInputs = [ pkgconfig ];
2121
buildInputs = [
22-
alsaLib freetype ftgl libjack2 libX11 lv2 mesa
22+
alsaLib freetype ftgl libjack2 libX11 lv2 libGLU_combined
2323
ttf_bitstream_vera
2424
];
2525

‎pkgs/applications/audio/sisco.lv2/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ stdenv, fetchFromGitHub, lv2, pkgconfig, mesa, cairo, pango, libjack2 }:
1+
{ stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU_combined, cairo, pango, libjack2 }:
22

33
let
44
name = "sisco.lv2-${version}";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828
sourceRoot = src.name;
2929

3030
nativeBuildInputs = [ pkgconfig ];
31-
buildInputs = [ lv2 pango cairo libjack2 mesa ];
31+
buildInputs = [ lv2 pango cairo libjack2 libGLU_combined ];
3232

3333
postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk";
3434
sisco_VERSION = version;

‎pkgs/applications/audio/soundscape-renderer/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
, boost
1212
, ecasound
1313
, glibcLocales
14-
, mesa # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
14+
, libGLU_combined # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
1515
}:
1616

1717
stdenv.mkDerivation rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131
LC_ALL = "en_US.UTF-8";
3232

3333
nativeBuildInputs = [ autoreconfHook pkgconfig ];
34-
buildInputs = [ boost boost.dev ecasound mesa help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ];
34+
buildInputs = [ boost boost.dev ecasound libGLU_combined help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ];
3535

3636
# 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53
3737
# 2) Make it find ecasound headers

‎pkgs/applications/audio/x42-plugins/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{ stdenv, fetchurl, pkgconfig
22
, libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2
3-
, mesa_glu, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
3+
, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
44

55
stdenv.mkDerivation rec {
66
version = "20170428";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
};
1313

1414
nativeBuildInputs = [ pkgconfig ];
15-
buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ];
15+
buildInputs = [ libGLU ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ];
1616

1717
# Don't remove this. The default fails with 'do not know how to unpack source archive'
1818
# every now and then on Hydra. No idea why.

‎pkgs/applications/audio/yoshimi/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre
2-
, libjack2, libsndfile, libXdmcp, readline, lv2, mesa, minixml, pkgconfig, zlib, xorg
2+
, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU_combined, minixml, pkgconfig, zlib, xorg
33
}:
44

55
assert stdenv ? glibc;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414
};
1515

1616
buildInputs = [
17-
alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 mesa
17+
alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU_combined
1818
minixml zlib xorg.libpthreadstubs pcre
1919
];
2020

0 commit comments

Comments
 (0)