diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-28 15:09:34 -0400 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-17 14:43:18 -0400 |
commit | 263f5891b65c841352f5230a1aa7e22ac418a042 (patch) | |
tree | 0a72ec795d88b01a36455067d803a17b40ca7ab2 | |
parent | f7e2bb8cff563d00769a91658d859154f2cda38a (diff) |
treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa
Just use mesa for these to be more clear. Move these to aliases.nix
35 files changed, 79 insertions, 82 deletions
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 6b7b8069fd44..2defab51bc3a 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -11,9 +11,9 @@ let videoDrivers = config.services.xserver.videoDrivers; makePackage = p: pkgs.buildEnv { - name = "mesa-drivers+txc-${p.mesa_drivers.version}"; + name = "mesa-drivers+txc-${p.mesa.version}"; paths = - [ p.mesa_drivers + [ p.mesa.drivers (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc) ]; }; diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 33d65a860764..f5560a9b2032 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm , pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm -, epoxy, poppler, mesa_noglu, lirc }: +, epoxy, poppler, mesa, lirc }: stdenv.mkDerivation rec { name = "fbida-2.14"; - + src = fetchurl { url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz"; sha256 = "0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm"; @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc - mesa_noglu + mesa ]; - + makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" "JPEG_VER=62" ]; patchPhase = '' diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 3ccceb0e9220..52db51e1c790 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -54,7 +54,7 @@ let # Higan // TODO: "higan is not available for the x86_64 architecture" # Libretro - fluidsynth hidapi mesa_noglu libdrm + fluidsynth hidapi mesa libdrm # MAME qt48 fontconfig SDL2_ttf diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 25651a359d63..848b9809f8b9 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -15,7 +15,7 @@ , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen , cephSupport ? false, ceph -, openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm +, openGLSupport ? sdlSupport, mesa, epoxy, libdrm , virglSupport ? openGLSupport, virglrenderer , smbdSupport ? false, samba , hostCpuOnly ? false @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] ++ optionals xenSupport [ xen ] ++ optionals cephSupport [ ceph ] - ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ] + ++ optionals openGLSupport [ mesa epoxy libdrm ] ++ optionals virglSupport [ virglrenderer ] ++ optionals smbdSupport [ samba ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 22b6fc30007a..2ba618b89de7 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb +{ stdenv, fetchurl, meson, ninja, pkgconfig, wayland, libGL, mesa, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , colord, lcms2 , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ - wayland libGL mesa_noglu libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm + wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva libwebp wayland-protocols colord lcms2 diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index c17274295c96..aa404356d4db 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -144,7 +144,7 @@ rec { libidn tbb wayland - mesa_noglu + mesa libxkbcommon flac diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 5545142fdc3a..96395b6df2f7 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -3,7 +3,7 @@ , libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, bullet, luajit , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg , dbus, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp -, curl, libinput, systemd, mesa_noglu, writeText, gtk3 +, curl, libinput, systemd, mesa, writeText, gtk3 }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gtk3 ]; - buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa_noglu + buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.xorgproto xorg.libX11 udev systemd ]; diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 8edf702a24c6..07aac3d611b7 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, - luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa_noglu, + luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa, xkeyboard_config, pcre }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libpthreadstubs gdbm pcre - mesa_noglu + mesa xkeyboard_config ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # installer to try to do this, the file $out/e-wrappers.nix is created, # containing the needed configuration for wrapping those programs. It # can be used in the enlightenment module. The idea is: - # + # # 1) rename the original binary adding the extension .orig # 2) wrap the renamed binary at /run/wrappers/bin/ # 3) create a new symbolic link using the original binary name (in the diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix index ad4620d4f450..409b3f7bb8dd 100644 --- a/pkgs/desktops/enlightenment/ephoto.nix +++ b/pkgs/desktops/enlightenment/ephoto.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa, makeWrapper }: stdenv.mkDerivation rec { name = "ephoto-${version}"; version = "1.5"; - + src = fetchurl { url = "http://www.smhouston.us/stuff/${name}.tar.gz"; sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) - mesa_noglu.dev # otherwise pkg-config does not find gbm + mesa.dev # otherwise pkg-config does not find gbm makeWrapper ]; diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index e7dfb5ca3989..9c3974452242 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa_noglu, wrapGAppsHook }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa, wrapGAppsHook }: stdenv.mkDerivation rec { name = "rage-${version}"; version = "0.3.0"; - + src = fetchurl { url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.xz"; sha256 = "0gfzdd4jg78bkmj61yg49w7bzspl5m1nh6agqgs8k7qrq9q26xqy"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meson ninja (pkgconfig.override { vanilla = true; }) - mesa_noglu.dev + mesa.dev wrapGAppsHook ]; diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index a2cd8ee192d0..92d36c0e772f 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa, makeWrapper }: stdenv.mkDerivation rec { pname = "terminology"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ efl pcre - mesa_noglu + mesa ]; meta = { diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 1d3b13937fc0..683f8d7ace09 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -1,5 +1,5 @@ { llvmPackages, lib, fetchFromGitHub, cmake -, libpng, libjpeg, mesa_noglu, eigen, openblas +, libpng, libjpeg, mesa, eigen, openblas }: let @@ -37,7 +37,7 @@ in llvmPackages.stdenv.mkDerivation { # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # to get a hint howto setup atlas instead of openblas - buildInputs = [ llvmPackages.llvm libpng libjpeg mesa_noglu eigen openblas ]; + buildInputs = [ llvmPackages.llvm libpng libjpeg mesa eigen openblas ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index cff32ca2d70f..8eacbb4f855f 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl , pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3 -, mesa_noglu +, mesa , gstreamerSupport ? true, gst_all_1 }: let @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; propagatedBuildInputs = with xorg; [ - glib gdk_pixbuf gobject-introspection wayland mesa_noglu + glib gdk_pixbuf gobject-introspection wayland mesa libGL libXrandr libXfixes libXcomposite libXdamage ] ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 30b33c7aea97..21f1d4c39990 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -2,7 +2,7 @@ , expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection, fribidi , xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3, autoreconfHook, gsettings-desktop-schemas , x11Support ? stdenv.isLinux -, waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols +, waylandSupport ? stdenv.isLinux, mesa, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null , AppKit, Cocoa @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gsettings-desktop-schemas fribidi libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed - ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ] + ++ optionals waylandSupport [ mesa wayland wayland-protocols ] ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; #TODO: colord? diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 097ac0e3e98e..2d827e205210 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi -, libGL, libGL_driver +, libGL, mesa , minimal ? false, libva1-minimal }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { configureFlags = # Add FHS paths for non-NixOS applications. - [ "--with-drivers-path=${libGL_driver.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ + [ "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 752d56a344e4..c7f488e8726c 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig , libXext, libdrm, libXfixes, wayland, libffi, libX11 -, libGL, libGL_driver +, libGL, mesa , minimal ? false, libva-minimal }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ # Add FHS paths for non-NixOS applications. - "--with-drivers-path=${libGL_driver.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" + "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index a61b3c3f2ac9..d68422260144 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xorg, libGL_driver }: +{ stdenv, fetchurl, pkgconfig, xorg, mesa }: stdenv.mkDerivation rec { name = "libvdpau-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ xorg.libX11 ]; configureFlags = stdenv.lib.optional stdenv.isLinux - "--with-module-dir=${libGL_driver.driverLink}/lib/vdpau"; + "--with-module-dir=${mesa.drivers.driverLink}/lib/vdpau"; NIX_LDFLAGS = if stdenv.isDarwin then "-lX11" else null; diff --git a/pkgs/development/libraries/soil/default.nix b/pkgs/development/libraries/soil/default.nix index 6e30825cfb39..2f3ec44a08ce 100644 --- a/pkgs/development/libraries/soil/default.nix +++ b/pkgs/development/libraries/soil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mesa_noglu, libX11 }: +{ stdenv, fetchurl, unzip, mesa, libX11 }: stdenv.mkDerivation rec { name = "soil"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "00gpwp9dldzhsdhksjvmbhsd2ialraqbv6v6dpikdmpncj6mnc52"; }; - buildInputs = [ unzip mesa_noglu libX11 ]; - + buildInputs = [ unzip mesa libX11 ]; + sourceRoot = "Simple OpenGL Image Library/projects/makefile"; preBuild = "mkdir obj"; preInstall = "mkdir -p $out/lib $out/include"; diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 4473100a9f20..72803e09f075 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11, libdrm, mesa_noglu }: +{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11, libdrm, mesa }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m"; }; - buildInputs = [ libGLU epoxy libX11 libdrm mesa_noglu ]; + buildInputs = [ libGLU epoxy libX11 libdrm mesa ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 572adfeb0bb6..3f2891ffd510 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig , wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL -, libX11, dbus, wayland-protocols, libdrm, mesa_noglu +, libX11, dbus, wayland-protocols, libdrm, mesa , libpthreadstubs, libXdmcp, libXext, libXfixes , withOptionalPackages ? true, zlib, valgrind, doxygen }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL libX11 libXfixes dbus wayland-protocols - libpthreadstubs libXdmcp libXext libdrm mesa_noglu ] + libpthreadstubs libXdmcp libXext libdrm mesa ] ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ]; doCheck = true; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 47e1c37492c1..edb93169be28 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig , wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman -, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu +, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa , libpng, ffmpeg_4 }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland libGL wayland-protocols libinput libxkbcommon pixman - xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa_noglu + xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa libpng ffmpeg_4 ]; diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index f6969af30c2c..c44072309b19 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib -, libGLSupported +, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGLU_combined ? null }: diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index a7f055c70810..93a67b7c8623 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -138,7 +138,7 @@ in buildFHSUserEnv rec { libidn tbb wayland - mesa_noglu + mesa libxkbcommon # Other things from runtime diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix index f8c29bfb88fa..e18faf7c304e 100644 --- a/pkgs/games/tdm/default.nix +++ b/pkgs/games/tdm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, binutils-unwrapped, scons, gnum4, p7zip, glibc_multi, mesa_noglu +{ stdenv, fetchurl, binutils-unwrapped, scons, gnum4, p7zip, glibc_multi, mesa , xorg, libGLU_combined, openal , lib, makeWrapper, makeDesktopItem }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation { p7zip scons gnum4 makeWrapper ]; buildInputs = [ - glibc_multi mesa_noglu.dev xorg.libX11.dev openal + glibc_multi mesa.dev xorg.libX11.dev openal xorg.libXext.dev xorg.libXxf86vm.dev libGLU_combined ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 4c3a2b2d588f..3ac3c92de6f3 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] - ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.mesa_noglu.osmesa pkgs.libdrm ] + ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.mesa.osmesa pkgs.libdrm ] ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 442c54ac8462..f738b9f6da5f 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa_noglu, pkgconfig }: +{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkgconfig }: stdenv.mkDerivation rec { name = "kmscube-2018-06-17"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libdrm libX11 libGL mesa_noglu ]; + buildInputs = [ libdrm libX11 libGL mesa ]; meta = with stdenv.lib; { description = "Example OpenGL app using KMS/GBM"; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 34aa18465c86..62bc4ed0e00b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1768,7 +1768,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { + xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation { name = "xf86-video-amdgpu-19.0.1"; builder = ./builder.sh; src = fetchurl { @@ -1777,7 +1777,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto mesa_noglu libGL libdrm udev xorgserver ]; + buildInputs = [ xorgproto mesa libGL libdrm udev xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -1820,7 +1820,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { + xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation { name = "xf86-video-ati-19.0.1"; builder = ./builder.sh; src = fetchurl { @@ -1829,7 +1829,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto mesa_noglu libGL libdrm udev libpciaccess xorgserver ]; + buildInputs = [ xorgproto mesa libGL libdrm udev libpciaccess xorgserver ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 2c4d4fb3a5ab..21e61bc54d0e 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -36,7 +36,7 @@ $pcMap{"uuid"} = "libuuid"; $pcMap{"libudev"} = "udev"; $pcMap{"gl"} = "libGL"; $pcMap{"GL"} = "libGL"; -$pcMap{"gbm"} = "mesa_noglu"; +$pcMap{"gbm"} = "mesa"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "xorgproto"; $pcMap{"\$DRI3PROTO"} = "xorgproto"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 8a1eef6ac1d3..1185aa5f83bb 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -3,7 +3,7 @@ automake, autoconf, gettext, libiconv, libtool, intltool, mtdev, libevdev, libinput, freetype, tradcpp, fontconfig, meson, ninja, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, - mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, + mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, mcpp, epoxy, openss |