diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 58 |
1 files changed, 41 insertions, 17 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f95a6ecaa61..bbe15aca5d81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9606,7 +9606,7 @@ with pkgs; libdevil-nox = libdevil.override { libX11 = null; - mesa_noglu = null; + libGL = null; }; libdigidoc = callPackage ../development/libraries/libdigidoc { }; @@ -10437,9 +10437,28 @@ with pkgs; mergerfs = callPackage ../tools/filesystems/mergerfs { }; - mesaSupported = lib.elem system lib.platforms.mesaPlatforms; + ## libGL/libGLU/Mesa stuff - mesaDarwinOr = alternative: if stdenv.isDarwin + # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them + # Default implementation is `mesa`, but can be eventually replaced with `libglvnd`, + # or other runtime dispatcher + libGL = mesa_noglu; + + # Default libGLU + libGLU = mesa_glu; + + # Combined derivation, contains both libGL and libGLU + # Please, avoid using this attribute. It was meant as transitional hack + # for packages that assume that libGLU and libGL live in the same prefix. + # libGLU_combined propagates both libGL and libGLU + libGLU_combined = mesa; + + # Default derivation with libGL.so.1 to link into /run/opengl-drivers (if need) + libGL_driver = mesa_drivers; + + libGLSupported = lib.elem system lib.platforms.mesaPlatforms; + + libGLDarwinOr = alternative: if stdenv.isDarwin then callPackage ../development/libraries/mesa-darwin { inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; @@ -10447,14 +10466,16 @@ with pkgs; } else alternative; - mesa_noglu = mesaDarwinOr (callPackage ../development/libraries/mesa { + # FIXME: should be `libGL = libGLDarwinOr mesa_nonglu` but this change cause mass rebuild, + # until all packages will refer to libGL/GLU/GLU combined + mesa_noglu = libGLDarwinOr (callPackage ../development/libraries/mesa { # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity # grsecEnabled = true; # no more support in nixpkgs ATM }); - mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); - mesa_drivers = mesaDarwinOr ( + mesa_glu = libGLDarwinOr (callPackage ../development/libraries/mesa-glu { }); + mesa_drivers = libGLDarwinOr ( let mo = mesa_noglu.override { grsecEnabled = config.grsecurity or false; enableTextureFloats = true; @@ -10466,7 +10487,7 @@ with pkgs; # for packages that assume that libGLU and libGL live in the same prefix. # Otherwise it's better to use mesa_glu or mesa_noglu, depending on whether # you need libGLU or not (_glu propagates _noglu). - mesa = mesaDarwinOr (buildEnv { + mesa = libGLDarwinOr (buildEnv { name = "mesa-${mesa_noglu.version}"; paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu mesa_glu.dev ]; meta = { @@ -10474,6 +10495,8 @@ with pkgs; }; }); + ## End libGL/libGLU/Mesa stuff + meterbridge = callPackage ../applications/audio/meterbridge { }; mhddfs = callPackage ../tools/filesystems/mhddfs { }; @@ -10898,7 +10921,7 @@ with pkgs; qoauth = callPackage ../development/libraries/qoauth { }; qt3 = callPackage ../development/libraries/qt-3 { - openglSupport = mesaSupported; + openglSupport = libGLSupported; libpng = libpng12; }; @@ -10906,13 +10929,13 @@ with pkgs; qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true - mesa = mesa_noglu; inherit (pkgs.gnome2) libgnomeui GConf gnome_vfs; cups = if stdenv.isLinux then cups else null; # XXX: mariadb doesn't built on fbsd as of nov 2015 mysql = if (!stdenv.isFreeBSD) then mysql else null; + inherit libGL; inherit (pkgs.darwin) cf-private libobjc; inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; }; @@ -10937,7 +10960,7 @@ with pkgs; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; - mesa = mesa_noglu; + inherit libGL; inherit perl; inherit (gst_all_1) gstreamer gst-plugins-base; }); @@ -10951,7 +10974,7 @@ with pkgs; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; - mesa = mesa_noglu; + inherit libGL; inherit perl; inherit (gst_all_1) gstreamer gst-plugins-base; inherit (gnome3) gtk3 dconf; @@ -10966,7 +10989,7 @@ with pkgs; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; - mesa = mesa_noglu; + inherit libGL; inherit perl; inherit (gst_all_1) gstreamer gst-plugins-base; inherit (gnome3) gtk3 dconf; @@ -11217,7 +11240,7 @@ with pkgs; schroedinger = callPackage ../development/libraries/schroedinger { }; SDL = callPackage ../development/libraries/SDL { - openglSupport = mesaSupported; + openglSupport = libGLSupported; alsaSupport = stdenv.isLinux; x11Support = !stdenv.isCygwin; pulseaudioSupport = config.pulseaudio or stdenv.isLinux; @@ -11241,7 +11264,7 @@ with pkgs; SDL_ttf = callPackage ../development/libraries/SDL_ttf { }; SDL2 = callPackage ../development/libraries/SDL2 { - openglSupport = mesaSupported; + openglSupport = libGLSupported; alsaSupport = stdenv.isLinux; x11Support = !stdenv.isCygwin; waylandSupport = stdenv.isLinux; @@ -18600,12 +18623,13 @@ with pkgs; confd = callPackage ../tools/system/confd { }; construoBase = lowPrio (callPackage ../games/construo { - mesa = null; + libGL = null; freeglut = null; }); construo = construoBase.override { - inherit mesa freeglut; + inherit freeglut; + libGL = libGLU_combined; }; crack_attack = callPackage ../games/crack-attack { }; @@ -18946,7 +18970,7 @@ with pkgs; racer = callPackage ../games/racer { }; residualvm = callPackage ../games/residualvm { - openglSupport = mesaSupported; + openglSupport = libGLSupported; }; rftg = callPackage ../games/rftg { }; |