diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1ac2e2dc3e..b599c17f801 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10216,7 +10216,7 @@ in # Multi-arch "drivers" which we want to build for i686. driversi686Linux = recurseIntoAttrs { inherit (pkgsi686Linux) - mesa_drivers + mesa vaapiIntel libvdpau-va-gl vaapiVdpau @@ -12236,7 +12236,7 @@ in # libGL.so/libEGL.so/... to link agains them. Android NDK provides # an OpenGL implementation, we can just use that. libGL = if stdenv.hostPlatform.useAndroidPrebuilt then stdenv - else mesa_noglu.stubs; + else mesa.stubs; # Default libGLU libGLU = mesa_glu; @@ -12251,29 +12251,17 @@ in extraOutputsToInstall = [ "dev" ]; }; - # Default derivation with libGL.so.1 to link into /run/opengl-drivers (if need) - libGL_driver = mesa_drivers; - - libGLSupported = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms; - - mesa_noglu = callPackage ../development/libraries/mesa { + mesa = callPackage ../development/libraries/mesa { # 7 is the default, but only on Linux, so keep this for now llvmPackages = llvmPackages_7; inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; }; - mesa = mesa_noglu; mesa_glu = callPackage ../development/libraries/mesa-glu { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - # NOTE: 2018-07-12: legacy alias: - # gcsecurity bussiness is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/ - # floating point textures patents are expired, - # so package reduced to alias - mesa_drivers = mesa_noglu.drivers; - ## End libGL/libGLU/Mesa stuff meterbridge = callPackage ../applications/audio/meterbridge { }; |