mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge pull request #62167 from matthewbauer/alias-libgl
Add libGL* aliases
This commit is contained in:
Matthew Bauer
GitHub
commit
4d6f65b81f
44 changed files with 99 additions and 97 deletions
|
|
@ -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)
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ rec {
|
|||
libidn
|
||||
tbb
|
||||
wayland
|
||||
mesa_noglu
|
||||
mesa
|
||||
libxkbcommon
|
||||
|
||||
flac
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv, config, libGLSupported, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv
|
||||
{ stdenv, config, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, openglSupport ? libGLSupported, libGL, libGLU
|
||||
, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
|
||||
, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv, config, libGLSupported, fetchurl, pkgconfig
|
||||
{ stdenv, config, fetchurl, pkgconfig
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, openglSupport ? libGLSupported, libGL
|
||||
, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
|
||||
, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, x11Support? !stdenv.isDarwin, libXext, libXrender
|
||||
, gobjectSupport ? true, glib
|
||||
, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12
|
||||
, libGLSupported
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips)
|
||||
, libGL ? null # libGLU_combined is no longer a big dependency
|
||||
, pdfSupport ? true
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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?
|
||||
|
|
|
|||
|
|
@ -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" ];
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ let
|
|||
in
|
||||
|
||||
let self = stdenv.mkDerivation {
|
||||
name = "mesa-noglu-${version}";
|
||||
name = "mesa-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
|
|
|
|||
|
|
@ -6,8 +6,9 @@
|
|||
, cursorSupport ? true, libXcursor ? null
|
||||
, threadSupport ? true
|
||||
, mysqlSupport ? false, mysql ? null
|
||||
, libGLSupported
|
||||
, openglSupport ? libGLSupported, libGLU_combined ? null, libXmu ? null
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, openglSupport ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, libGLU_combined ? null, libXmu ? null
|
||||
, xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch, substituteAll
|
||||
, libXrender, libXinerama, libXcursor, libXv, libXext
|
||||
, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
|
||||
, libmng, which, libGLSupported, libGLU, openssl, dbus, cups, pkgconfig
|
||||
, libmng, which, libGLU, openssl, dbus, cups, pkgconfig
|
||||
, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
|
||||
, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
|
||||
, buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, flashplayerFix ? false, gdk_pixbuf
|
||||
, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2
|
||||
, gnomeStyle ? false, libgnomeui, GConf, gnome_vfs
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
|
||||
, gstreamer, gst-plugins-base, GConf, libX11, cairo
|
||||
, libGLSupported
|
||||
, withMesa ? libGLSupported, libGLU ? null, libGL ? null
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, libGLU ? null, libGL ? null
|
||||
, compat24 ? false, compat26 ? true, unicode ? true,
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
|
||||
, gstreamer, gst-plugins-base, GConf, setfile
|
||||
, libGLSupported
|
||||
, withMesa ? libGLSupported, libGLU ? null, libGL ? null
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, libGLU ? null, libGL ? null
|
||||
, compat24 ? false, compat26 ? true, unicode ? true
|
||||
, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{ stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig
|
||||
, gtk2, gtk3, libXinerama, libSM, libXxf86vm
|
||||
, xorgproto, gstreamer, gst-plugins-base, GConf, setfile
|
||||
, libGLSupported
|
||||
, withMesa ? libGLSupported, libGLU ? null, libGL ? null
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, libGLU ? null, libGL ? null
|
||||
, compat24 ? false, compat26 ? true, unicode ? true
|
||||
, withGtk2 ? true
|
||||
, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ in buildFHSUserEnv rec {
|
|||
libidn
|
||||
tbb
|
||||
wayland
|
||||
mesa_noglu
|
||||
mesa
|
||||
libxkbcommon
|
||||
|
||||
# Other things from runtime
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}) {};
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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, openssl, pkgconfig, llvm_6,
|
||||
cf-private, ApplicationServices, Carbon, Cocoa, Xplugin
|
||||
}:
|
||||
|
|
@ -382,7 +382,7 @@ self: super:
|
|||
});
|
||||
|
||||
xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: {
|
||||
buildInputs = attrs.buildInputs ++ [ mesa_noglu llvm_6 ]; # for libxatracker
|
||||
buildInputs = attrs.buildInputs ++ [ mesa llvm_6 ]; # for libxatracker
|
||||
meta = attrs.meta // {
|
||||
platforms = ["i686-linux" "x86_64-linux"];
|
||||
};
|
||||
|
|
@ -507,7 +507,7 @@ self: super:
|
|||
if (!isDarwin)
|
||||
then {
|
||||
outputs = [ "out" "dev" ];
|
||||
buildInputs = commonBuildInputs ++ [ libdrm mesa_noglu ];
|
||||
buildInputs = commonBuildInputs ++ [ libdrm mesa ];
|
||||
propagatedBuildInputs = [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
|
||||
udev
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchFromGitHub, fetchpatch
|
||||
, libX11, libGL, mesa_noglu
|
||||
, libX11, libGL, mesa
|
||||
, nvidia_x11 ? null
|
||||
, libglvnd
|
||||
}:
|
||||
|
|
@ -33,7 +33,7 @@ in stdenv.mkDerivation {
|
|||
makeFlags = [ "LIBDIR=$(out)/lib"
|
||||
"PRIMUS_libGLa=${aPackage}/lib/libGL.so"
|
||||
"PRIMUS_libGLd=${libGL}/lib/libGL.so"
|
||||
"PRIMUS_LOAD_GLOBAL=${mesa_noglu}/lib/libglapi.so"
|
||||
"PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{stdenv, fetchurl, fetchpatch
|
||||
, freeglut, ghostscriptX, imagemagick, fftw
|
||||
, boehmgc, libGLU, libGL, mesa_noglu, ncurses, readline, gsl, libsigsegv
|
||||
, boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv
|
||||
, python, zlib, perl, texLive, texinfo, xz
|
||||
, darwin
|
||||
}:
|
||||
|
|
@ -20,7 +20,7 @@ let
|
|||
boehmgc ncurses readline gsl libsigsegv
|
||||
python zlib perl texLive texinfo xz ]
|
||||
++ stdenv.lib.optionals stdenv.isLinux
|
||||
[ freeglut libGLU libGL mesa_noglu.osmesa ]
|
||||
[ freeglut libGLU libGL mesa.osmesa ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin
|
||||
(with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ])
|
||||
;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm,
|
||||
python27, wayland, udev, mesa_noglu, wafHook }:
|
||||
python27, wayland, udev, mesa, wafHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "glmark2-${version}";
|
||||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkgconfig wafHook ];
|
||||
buildInputs = [
|
||||
libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa_noglu
|
||||
libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa
|
||||
];
|
||||
|
||||
wafConfigureFlags = ["--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2"];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype
|
||||
, gtk3, pango
|
||||
, makeWrapper , python, pythonPackages, lib
|
||||
, lsof, curl, libuuid, cups, mesa_drivers
|
||||
, lsof, curl, libuuid, cups, mesa
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -18,7 +18,7 @@ let
|
|||
|
||||
# used of both wrappers and libpath
|
||||
libPath = lib.makeLibraryPath (with xorg; [
|
||||
mesa_drivers
|
||||
mesa.drivers
|
||||
libGLU_combined
|
||||
fontconfig
|
||||
freetype
|
||||
|
|
|
|||
|
|
@ -174,6 +174,7 @@ mapAliases ({
|
|||
libgnome_keyring = libgnome-keyring; # added 2018-02-25
|
||||
libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
|
||||
libgumbo = gumbo; # added 2018-01-21
|
||||
libGL_driver = mesa.drivers;
|
||||
libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14
|
||||
libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
|
||||
liblapackWithoutAtlas = liblapack; # added 2018-11-05
|
||||
|
|
@ -193,6 +194,12 @@ mapAliases ({
|
|||
man_db = man-db; # added 2016-05
|
||||
manpages = man-pages; # added 2015-12-06
|
||||
memtest86 = memtest86plus; # added 2019-05-08
|
||||
mesa_noglu = mesa; # added 2019-05-28
|
||||
# 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.drivers;
|
||||
midoriWrapper = midori; # added 2015-01
|
||||
mlt-qt5 = libsForQt5.mlt; # added 2015-12-19
|
||||
mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25
|
||||
|
|
|
|||
|
|
@ -10212,7 +10212,7 @@ in
|
|||
# Multi-arch "drivers" which we want to build for i686.
|
||||
driversi686Linux = recurseIntoAttrs {
|
||||
inherit (pkgsi686Linux)
|
||||
mesa_drivers
|
||||
mesa
|
||||
vaapiIntel
|
||||
libvdpau-va-gl
|
||||
vaapiVdpau
|
||||
|
|
@ -12232,7 +12232,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;
|
||||
|
|
@ -12247,29 +12247,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 { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue