commit a8aeef711ea535fa98118af5e24c334d89071827 · pyrox.dev/nixpkgs

+2 -1

pkgs/applications/editors/atom/env.nix

···

       1
       1
        
       { stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig

     

       2
       2
        
       , libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr

     

       3
       3
        
       , gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk

     

       4
       4
       -
       , at-spi2-core, libdbusmenu

     

       4
       4
       +
       , at-spi2-core, libdbusmenu, mesa

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       let

     
···

       12
       12
        
           xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr

     

       13
       13
        
           xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify

     

       14
       14
        
           xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu

     

       15
       15
       +
           mesa # required for libgbm

     

       15
       16
        
         ];

     

       16
       17
        
       

     

       17
       18
        
         libPathNative = lib.makeLibraryPath packages;

+2 -1

pkgs/applications/graphics/drawio/default.nix

···

       4
       4
        
       , alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, dbus, cups, expat

     

       5
       5
        
       , gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor

     

       6
       6
        
       , libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst

     

       7
       7
       -
       , libxcb, libuuid, libxshmfence, nspr, nss, pango

     

       7
       7
       +
       , libxcb, libuuid, libxshmfence, nspr, nss, pango, mesa

     

       8
       8
        
       

     

       9
       9
        
       , systemd

     

       10
       10
        
       }:

     
···

       50
       50
        
           libXtst

     

       51
       51
        
           libxcb

     

       52
       52
        
           libuuid

     

       53
       53
       +
           mesa # for libgbm

     

       53
       54
        
           nspr

     

       54
       55
        
           nss

     

       55
       56
        
           pango

+1

pkgs/applications/networking/browsers/chromium/common.nix

···

       138
       138
        
             bison gperf libkrb5

     

       139
       139
        
             glib gtk3 dbus-glib

     

       140
       140
        
             libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL

     

       141
       141
       +
             mesa # required for libgbm

     

       141
       142
        
             pciutils protobuf speechd libXdamage at-spi2-core

     

       142
       143
        
             jre

     

       143
       144
        
             pipewire

+4 -3

pkgs/applications/networking/browsers/firefox/common.nix

···

       6
       6
        
       , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg

     

       7
       7
        
       , freetype, fontconfig, file, nspr, nss, nss_3_53

     

       8
       8
        
       , yasm, libGLU, libGL, sqlite, unzip, makeWrapper

     

       9
       9
       -
       , hunspell, libXdamage, libevent, libstartup_notification

     

       9
       9
       +
       , hunspell, libevent, libstartup_notification

     

       10
       10
        
       , libvpx_1_8

     

       11
       11
        
       , icu67, libpng, jemalloc, glib, pciutils

     

       12
       12
        
       , autoconf213, which, gnused, rustPackages, rustPackages_1_45

     
···

       22
       22
        
       , pulseaudioSupport ? stdenv.isLinux, libpulseaudio

     

       23
       23
        
       , ffmpegSupport ? true

     

       24
       24
        
       , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook

     

       25
       25
       -
       , waylandSupport ? true, libxkbcommon

     

       25
       25
       +
       , waylandSupport ? true, libxkbcommon, libdrm

     

       26
       26
        
       , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages

     

       27
       27
        
       , gssSupport ? true, libkrb5

     

       28
       28
        
       , pipewireSupport ? waylandSupport && webrtcSupport, pipewire

     
···

       161
       161
        
           xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file

     

       162
       162
        
           xorg.pixman yasm libGLU libGL

     

       163
       163
        
           xorg.xorgproto

     

       164
       164
       +
           xorg.libXdamage

     

       164
       165
        
           xorg.libXext makeWrapper

     

       165
       166
        
           libevent libstartup_notification /* cairo */

     

       166
       167
        
           libpng jemalloc glib

     
···

       175
       176
        
         ++ lib.optional  pulseaudioSupport libpulseaudio # only headers are needed

     

       176
       177
        
         ++ lib.optional  gtk3Support gtk3

     

       177
       178
        
         ++ lib.optional  gssSupport libkrb5

     

       178
       178
       -
         ++ lib.optional  waylandSupport libxkbcommon

     

       179
       179
       +
         ++ lib.optionals waylandSupport [ libxkbcommon libdrm ]

     

       179
       180
        
         ++ lib.optional  pipewireSupport pipewire

     

       180
       181
        
         ++ lib.optional  (lib.versionAtLeast ffversion "82") gnum4

     

       181
       182
        
         ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos

+2 -1

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix

···

       2
       2
        
       , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig

     

       3
       3
        
       , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite

     

       4
       4
        
       , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib

     

       5
       5
       -
       , cups, expat, libuuid, at-spi2-core, libappindicator-gtk3

     

       5
       5
       +
       , cups, expat, libuuid, at-spi2-core, libappindicator-gtk3, mesa

     

       6
       6
        
       # Runtime dependencies:

     

       7
       7
        
       , systemd, libnotify, libdbusmenu, libpulseaudio

     

       8
       8
        
       # Unfortunately this also overwrites the UI language (not just the spell

     
···

       73
       73
        
           libappindicator-gtk3

     

       74
       74
        
           libnotify

     

       75
       75
        
           libuuid

     

       76
       76
       +
           mesa # for libgbm

     

       76
       77
        
           nspr

     

       77
       78
        
           nss

     

       78
       79
        
           pango

+3 -2

pkgs/applications/networking/mailreaders/thunderbird/default.nix

···

       61
       61
        
       , alsaSupport ? stdenv.isLinux, alsaLib

     

       62
       62
        
       , pulseaudioSupport ? stdenv.isLinux, libpulseaudio

     

       63
       63
        
       , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook

     

       64
       64
       -
       , waylandSupport ? true

     

       64
       64
       +
       , waylandSupport ? true, libdrm

     

       65
       65
        
       , libxkbcommon, calendarSupport ? true

     

       66
       66
        
       

     

       67
       67
        
       # Use official trademarked branding.  Permission obtained at:

     
···

       137
       137
        
           xorg.libXt

     

       138
       138
        
           xorg.pixman

     

       139
       139
        
           xorg.xorgproto

     

       140
       140
       +
           xorg.libXdamage

     

       140
       141
        
           zip

     

       141
       142
        
           zlib

     

       142
       143
        
         ] ++ lib.optional alsaSupport alsaLib

     

       143
       144
        
           ++ lib.optional gtk3Support gtk3

     

       144
       145
        
           ++ lib.optional pulseaudioSupport libpulseaudio

     

       145
       145
       -
           ++ lib.optional waylandSupport libxkbcommon;

     

       146
       146
       +
           ++ lib.optionals waylandSupport [ libxkbcommon libdrm ];

     

       146
       147
        
       

     

       147
       148
        
         NIX_CFLAGS_COMPILE =[

     

       148
       149
        
           "-I${glib.dev}/include/gio-unix-2.0"

+2 -1

pkgs/applications/networking/mullvad-vpn/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, dpkg

     

       2
       2
        
       , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype

     

       3
       3
       -
       , gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3

     

       3
       3
       +
       , gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, mesa

     

       4
       4
        
       , xorg, autoPatchelfHook, systemd, libnotify, libappindicator

     

       5
       5
        
       }:

     

       6
       6
        
       

     
···

       20
       20
        
           gtk3

     

       21
       21
        
           libappindicator

     

       22
       22
        
           libnotify

     

       23
       23
       +
           mesa

     

       23
       24
        
           xorg.libX11

     

       24
       25
        
           xorg.libXScrnSaver

     

       25
       26
        
           xorg.libXcomposite

+2

pkgs/applications/office/onlyoffice-bin/default.nix

···

       21
       21
        
       , gtk3

     

       22
       22
        
       , libpulseaudio

     

       23
       23
        
       , libudev0-shim

     

       24
       24
       +
       , libdrm

     

       24
       25
        
       , makeWrapper

     

       25
       26
        
       , nspr

     

       26
       27
        
       , nss

     
···

       101
       102
        
           gtk2

     

       102
       103
        
           gtk3

     

       103
       104
        
           libpulseaudio

     

       105
       105
       +
           libdrm

     

       104
       106
        
           nspr

     

       105
       107
        
           nss

     

       106
       108
        
           qt5.qtbase

+1 -1

pkgs/applications/video/byzanz/default.nix

···

       19
       19
        
         NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ pkg-config ];

     

       22
       22
       -
         buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo ]

     

       22
       22
       +
         buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo xorg.libXdamage ]

     

       23
       23
        
         ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]);

     

       24
       24
        
       

     

       25
       25
        
         meta = with lib; {

+1

pkgs/applications/video/kodi/unwrapped.nix

···

       127
       127
        
             bluez giflib glib harfbuzz lcms2 libpthreadstubs

     

       128
       128
        
             ffmpeg flatbuffers fmt fstrcmp rapidjson

     

       129
       129
        
             lirc

     

       130
       130
       +
             mesa # for libEGL

     

       130
       131
        
           ]

     

       131
       132
        
           ++ lib.optional x11Support [

     

       132
       133
        
             libX11 xorgproto libXt libXmu libXext.dev libXdmcp

+2

pkgs/applications/video/streamlink-twitch-gui/bin.nix

···

       19
       19
        
       , gtk3-x11

     

       20
       20
        
       , libudev0-shim

     

       21
       21
        
       , libuuid

     

       22
       22
       +
       , mesa

     

       22
       23
        
       , nss

     

       23
       24
        
       , nspr

     

       24
       25
        
       , xorg

     
···

       63
       64
        
           glib

     

       64
       65
        
           pango

     

       65
       66
        
           gtk3-x11

     

       67
       67
       +
           mesa

     

       66
       68
        
           nss

     

       67
       69
        
           nspr

     

       68
       70
        
           libuuid

+2 -1

pkgs/applications/window-managers/cage/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub

     

       2
       2
        
       , meson, ninja, pkg-config, wayland, scdoc, makeWrapper

     

       3
       3
        
       , wlroots, wayland-protocols, pixman, libxkbcommon

     

       4
       4
       -
       , systemd, libGL, libX11

     

       4
       4
       +
       , systemd, libGL, libX11, mesa

     

       5
       5
        
       , xwayland ? null

     

       6
       6
        
       , nixosTests

     

       7
       7
        
       }:

     
···

       26
       26
        
       

     

       27
       27
        
         buildInputs = [

     

       28
       28
        
           wlroots wayland wayland-protocols pixman libxkbcommon

     

       29
       29
       +
           mesa # for libEGL headers

     

       29
       30
        
           systemd libGL libX11

     

       30
       31
        
         ];

     

       31
       32

+2 -1

pkgs/applications/window-managers/cagebreak/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub

     

       2
       2
        
       , meson, ninja, pkg-config, wayland, scdoc, makeWrapper

     

       3
       3
        
       , wlroots, wayland-protocols, pixman, libxkbcommon

     

       4
       4
       -
       , cairo , pango, fontconfig, pandoc, systemd

     

       4
       4
       +
       , cairo , pango, fontconfig, pandoc, systemd, mesa

     

       5
       5
        
       , withXwayland ? true, xwayland

     

       6
       6
        
       , nixosTests

     

       7
       7
        
       }:

     
···

       22
       22
        
         buildInputs = [

     

       23
       23
        
           wlroots wayland wayland-protocols pixman libxkbcommon cairo

     

       24
       24
        
           pango fontconfig pandoc systemd

     

       25
       25
       +
           mesa # for libEGL headers

     

       25
       26
        
         ];

     

       26
       27
        
       

     

       27
       28
        
         outputs = [ "out" "contrib" ];

+2 -1

pkgs/applications/window-managers/hikari/default.nix

···

       1
       1
        
       { lib, stdenv, fetchzip,

     

       2
       2
        
         pkg-config, bmake,

     

       3
       3
        
         cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman,

     

       4
       4
       -
         libucl, wayland, wayland-protocols, wlroots,

     

       4
       4
       +
         libucl, wayland, wayland-protocols, wlroots, mesa,

     

       5
       5
        
         features ? {

     

       6
       6
        
           gammacontrol = true;

     

       7
       7
        
           layershell   = true;

     
···

       35
       35
        
           pango

     

       36
       36
        
           pixman

     

       37
       37
        
           libucl

     

       38
       38
       +
           mesa # for libEGL

     

       38
       39
        
           wayland

     

       39
       40
        
           wayland-protocols

     

       40
       41
        
           wlroots

+2

pkgs/applications/window-managers/waybox/default.nix

···

       11
       11
        
       , pixman

     

       12
       12
        
       , udev

     

       13
       13
        
       , libGL

     

       14
       14
       +
       , mesa

     

       14
       15
        
       }:

     

       15
       16
        
       

     

       16
       17
        
       stdenv.mkDerivation rec {

     
···

       33
       34
        
           pixman

     

       34
       35
        
           udev

     

       35
       36
        
           libGL

     

       37
       37
       +
           mesa # for libEGL

     

       36
       38
        
         ];

     

       37
       39
        
       

     

       38
       40
        
         meta = with lib; {

+2 -2

pkgs/applications/window-managers/wayfire/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, meson, ninja, pkg-config, git

     

       2
       2
        
       , cairo, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland

     

       3
       3
       -
       , wayland-protocols, wf-config, wlroots

     

       3
       3
       +
       , wayland-protocols, wf-config, wlroots, mesa

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     
···

       15
       15
        
         nativeBuildInputs = [ meson ninja pkg-config wayland ];

     

       16
       16
        
         buildInputs = [

     

       17
       17
        
           cairo libdrm libexecinfo libinput libjpeg libxkbcommon wayland

     

       18
       18
       -
           wayland-protocols wf-config wlroots

     

       18
       18
       +
           wayland-protocols wf-config wlroots mesa

     

       19
       19
        
         ];

     

       20
       20
        
       

     

       21
       21
        
         mesonFlags = [ "--sysconfdir" "/etc" ];

+2

pkgs/applications/window-managers/wio/default.nix

···

       10
       10
        
       , wayland

     

       11
       11
        
       , wayland-protocols

     

       12
       12
        
       , wlroots

     

       13
       13
       +
       , mesa

     

       13
       14
        
       , xwayland

     

       14
       15
        
       , makeWrapper

     

       15
       16
        
       }:

     
···

       32
       33
        
           wayland

     

       33
       34
        
           wayland-protocols

     

       34
       35
        
           wlroots

     

       36
       36
       +
           mesa # for libEGL

     

       35
       37
        
           xwayland

     

       36
       38
        
         ];

     

       37
       39

+2

pkgs/desktops/pantheon/desktop/wingpanel/default.nix

···

       13
       13
        
       , granite

     

       14
       14
        
       , gettext

     

       15
       15
        
       , mutter

     

       16
       16
       +
       , mesa

     

       16
       17
        
       , json-glib

     

       17
       18
        
       , python3

     

       18
       19
        
       , elementary-gtk-theme

     
···

       55
       56
        
           json-glib

     

       56
       57
        
           libgee

     

       57
       58
        
           mutter

     

       59
       59
       +
           mesa # for libEGL

     

       58
       60
        
         ];

     

       59
       61
        
       

     

       60
       62
        
         patches = [

+2 -2

pkgs/development/libraries/gtk/3.x.nix

···

       36
       36
        
       , tracker

     

       37
       37
        
       , x11Support ? stdenv.isLinux

     

       38
       38
        
       , waylandSupport ? stdenv.isLinux

     

       39
       39
       -
       , mesa

     

       39
       39
       +
       , libGL

     

       40
       40
        
       , wayland

     

       41
       41
        
       , wayland-protocols

     

       42
       42
        
       , xineramaSupport ? stdenv.isLinux

     
···

       143
       143
        
           # explicitly propagated, always needed

     

       144
       144
        
           Cocoa

     

       145
       145
        
         ] ++ lib.optionals waylandSupport [

     

       146
       146
       -
           mesa

     

       146
       146
       +
           libGL

     

       147
       147
        
           wayland

     

       148
       148
        
           wayland-protocols

     

       149
       149
        
         ] ++ lib.optionals xineramaSupport [

+2 -2

pkgs/development/libraries/gtk/4.x.nix

···

       38
       38
        
       , tracker

     

       39
       39
        
       , x11Support ? stdenv.isLinux

     

       40
       40
        
       , waylandSupport ? stdenv.isLinux

     

       41
       41
       -
       , mesa

     

       41
       41
       +
       , libGL

     

       42
       42
        
       , vulkan-loader

     

       43
       43
        
       , vulkan-headers

     

       44
       44
        
       , wayland

     
···

       124
       124
        
         ] ++ lib.optionals trackerSupport [

     

       125
       125
        
           tracker

     

       126
       126
        
         ] ++ lib.optionals waylandSupport [

     

       127
       127
       -
           mesa

     

       127
       127
       +
           libGL

     

       128
       128
        
           wayland

     

       129
       129
        
           wayland-protocols

     

       130
       130
        
         ] ++ lib.optionals xineramaSupport [

+24 -11

pkgs/development/libraries/mesa/default.nix

···

       34
       34
        
         # Release frequency: https://www.mesa3d.org/releasing.html#schedule

     

       35
       35
        
         version = "21.0.2";

     

       36
       36
        
         branch  = versions.major version;

     

       37
       37
       -
       in

     

       38
       37
        
       

     

       39
       39
       -
       stdenv.mkDerivation {

     

       38
       38
       +
       self = stdenv.mkDerivation {

     

       40
       39
        
         pname = "mesa";

     

       41
       40
        
         inherit version;

     

       42
       41
        
       

     
···

       88
       87
        
             "find_program('${stdenv.cc.targetPrefix}nm')"

     

       89
       88
        
         '';

     

       90
       89
        
       

     

       91
       91
       -
         outputs = [ "out" "dev" "drivers" ] ++ lib.optional enableOSMesa "osmesa";

     

       90
       90
       +
         outputs = [ "out" "dev" "drivers" ]

     

       91
       91
       +
           ++ lib.optional enableOSMesa "osmesa"

     

       92
       92
       +
           ++ lib.optional stdenv.isLinux "driversdev";

     

       92
       93
        
       

     

       93
       94
        
         # TODO: Figure out how to enable opencl without having a runtime dependency on clang

     

       94
       95
        
         mesonFlags = [

     
···

       181
       182
        
           mv -t $osmesa/lib/ $out/lib/libOSMesa*

     

       182
       183
        
         '';

     

       183
       184
        
       

     

       184
       184
       -
         # TODO:

     

       185
       185
       -
         #  check $out doesn't depend on llvm: builder failures are ignored

     

       186
       186
       -
         #  for some reason grep -qv '${llvmPackages.llvm}' -R "$out";

     

       187
       185
        
         postFixup = optionalString stdenv.isLinux ''

     

       188
       186
        
           # set the default search path for DRI drivers; used e.g. by X server

     

       189
       187
        
           substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace "$drivers" "${libglvnd.driverLink}"

     

       188
       188
       +
           substituteInPlace "$dev/lib/pkgconfig/d3d.pc" --replace "$drivers" "${libglvnd.driverLink}"

     

       190
       189
        
       

     

       191
       190
        
           # remove pkgconfig files for GL/EGL; they are provided by libGL.

     

       192
       191
        
           rm -f $dev/lib/pkgconfig/{gl,egl}.pc

     

       193
       192
        
       

     

       194
       194
       -
           # Update search path used by pkg-config

     

       195
       195
       -
           for pc in $dev/lib/pkgconfig/{d3d,dri,xatracker}.pc; do

     

       196
       196
       -
             if [ -f "$pc" ]; then

     

       197
       197
       -
               substituteInPlace "$pc" --replace $out $drivers

     

       193
       193
       +
           # Move development files for libraries in $drivers to $driversdev

     

       194
       194
       +
           mkdir -p $driversdev/include

     

       195
       195
       +
           mv $dev/include/xa_* $dev/include/d3d* $driversdev/include

     

       196
       196
       +
           mkdir -p $driversdev/lib/pkgconfig

     

       197
       197
       +
           for pc in lib/pkgconfig/{xatracker,d3d}.pc; do

     

       198
       198
       +
             if [ -f "$dev/$pc" ]; then

     

       199
       199
       +
               substituteInPlace "$dev/$pc" --replace $out $drivers

     

       200
       200
       +
               mv $dev/$pc $driversdev/$pc

     

       198
       201
        
             fi

     

       199
       202
        
           done

     

       200
       203
        
       

     
···

       212
       215
        
         passthru = {

     

       213
       216
        
           inherit libdrm;

     

       214
       217
        
           inherit (libglvnd) driverLink;

     

       218
       218
       +
       

     

       219
       219
       +
           tests.devDoesNotDependOnLLVM = stdenv.mkDerivation {

     

       220
       220
       +
             name = "mesa-dev-does-not-depend-on-llvm";

     

       221
       221
       +
             buildCommand = ''

     

       222
       222
       +
               echo ${self.dev} >>$out

     

       223
       223
       +
             '';

     

       224
       224
       +
             disallowedRequisites = [ llvmPackages.llvm self.drivers ];

     

       225
       225
       +
           };

     

       215
       226
        
         };

     

       216
       227
        
       

     

       217
       228
        
         meta = {

     
···

       231
       242
        
           platforms = platforms.mesaPlatforms;

     

       232
       243
        
           maintainers = with maintainers; [ primeos vcunat ]; # Help is welcome :)

     

       233
       244
        
         };

     

       234
       234
       -
       }

     

       245
       245
       +
       };

     

       246
       246
       +
       

     

       247
       247
       +
       in self

+3 -3

pkgs/development/libraries/mesa/stubs.nix

···

       52
       52
        
       

     

       53
       53
        
           mkdir -p $dev/{,lib/pkgconfig,nix-support}

     

       54
       54
        
           echo "$out ${libglvnd} ${libglvnd.dev}" > $dev/nix-support/propagated-build-inputs

     

       55
       55
       -
           ln -s ${mesa.dev}/include $dev/include

     

       55
       55
       +
           ln -s ${libglvnd.dev}/include $dev/include

     

       56
       56
        
       

     

       57
       57
        
           genPkgConfig() {

     

       58
       58
        
             local name="$1"

     
···

       61
       61
        
             cat <<EOF >$dev/lib/pkgconfig/$name.pc

     

       62
       62
        
           Name: $name

     

       63
       63
        
           Description: $lib library

     

       64
       64
       -
           Version: ${mesa.version}

     

       64
       64
       +
           Version: ${libglvnd.version}

     

       65
       65
        
           Libs: -L${libglvnd.out}/lib -l$lib

     

       66
       66
       -
           Cflags: -I${mesa.dev}/include -I${libglvnd.dev}/include

     

       66
       66
       +
           Cflags: -I${libglvnd.dev}/include

     

       67
       67
        
           EOF

     

       68
       68
        
           }

     

       69
       69

+1

pkgs/development/libraries/qt-5/5.14/default.nix

···

       118
       118
        
             ./qtwebkit-darwin-no-qos-classes.patch

     

       119
       119
        
           ];

     

       120
       120
        
           qttools = [ ./qttools.patch ];

     

       121
       121
       +
           qtwayland = [ ./qtwayland-libdrm-build.patch ];

     

       121
       122
        
         };

     

       122
       123
        
       

     

       123
       124
        
         qtModule =

+56

pkgs/development/libraries/qt-5/5.14/qtwayland-libdrm-build.patch

···

       1
       1
       +
       commit 7217ea9cf297e664be876eb82b66a1b4f157ca80

     

       2
       2
       +
       Author: Peter Seiderer <ps.report@gmx.net>

     

       3
       3
       +
       Date:   Fri Apr 3 21:52:30 2020 +0200

     

       4
       4
       +
       

     

       5
       5
       +
           fix libdrm related configure test failure

     

       6
       6
       +
           

     

       7
       7
       +
           Fixes:

     

       8
       8
       +
           

     

       9
       9
       +
             Project ERROR: Test config.qtwayland_client.tests.dmabuf-server-buffer tries to use undeclared library 'drm'

     

       10
       10
       +
             Project ERROR: Test config.qtwayland_compositor.tests.dmabuf-server-buffer tries to use undeclared library 'drm'

     

       11
       11
       +
             Project ERROR: Test config.qtwayland_compositor.tests.dmabuf-client-buffer tries to use undeclared library 'drm'

     

       12
       12
       +
           

     

       13
       13
       +
           Task-number: QTBUG-83303

     

       14
       14
       +
           Change-Id: I3970f4e3855fcfa760493631a14adb6a16950aa9

     

       15
       15
       +
           Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>

     

       16
       16
       +
           Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>

     

       17
       17
       +
           Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

     

       18
       18
       +
           (cherry picked from commit ca63fe81df8ac910f43539719566ed6745700c2b)

     

       19
       19
       +
           (cherry picked from commit 1344ca6b5a8fbc1b28727feea6d856af8bf3bc93)

     

       20
       20
       +
       

     

       21
       21
       +
       diff --git a/src/client/configure.json b/src/client/configure.json

     

       22
       22
       +
       index 06213968..27c73f89 100644

     

       23
       23
       +
       --- a/src/client/configure.json

     

       24
       24
       +
       +++ b/src/client/configure.json

     

       25
       25
       +
       @@ -74,7 +74,8 @@

     

       26
       26
       +
                    "label": "Linux dma-buf Buffer Sharing",

     

       27
       27
       +
                    "type": "compile",

     

       28
       28
       +
                    "test": "dmabuf_server_buffer",

     

       29
       29
       +
       -            "use": "egl drm"

     

       30
       30
       +
       +            "libs": "-ldrm",

     

       31
       31
       +
       +            "use": "egl"

     

       32
       32
       +
                },

     

       33
       33
       +
                "vulkan-server-buffer": {

     

       34
       34
       +
                    "label": "Vulkan Buffer Sharing",

     

       35
       35
       +
       diff --git a/src/compositor/configure.json b/src/compositor/configure.json

     

       36
       36
       +
       index 0dbb3364..73e4c1a8 100644

     

       37
       37
       +
       --- a/src/compositor/configure.json

     

       38
       38
       +
       +++ b/src/compositor/configure.json

     

       39
       39
       +
       @@ -80,13 +80,15 @@

     

       40
       40
       +
                    "label": "Linux dma-buf Buffer Sharing",

     

       41
       41
       +
                    "type": "compile",

     

       42
       42
       +
                    "test": "dmabuf_server_buffer",

     

       43
       43
       +
       -            "use": "egl drm"

     

       44
       44
       +
       +            "libs": "-ldrm",

     

       45
       45
       +
       +            "use": "egl"

     

       46
       46
       +
                },

     

       47
       47
       +
                "dmabuf-client-buffer": {

     

       48
       48
       +
                    "label": "Linux Client dma-buf Buffer Sharing",

     

       49
       49
       +
                    "type": "compile",

     

       50
       50
       +
                    "test": "dmabuf_client_buffer",

     

       51
       51
       +
       -            "use": "egl drm"

     

       52
       52
       +
       +            "libs": "-ldrm",

     

       53
       53
       +
       +            "use": "egl"

     

       54
       54
       +
                },

     

       55
       55
       +
                "vulkan-server-buffer": {

     

       56
       56
       +
                    "label": "Vulkan Buffer Sharing",

+2

pkgs/development/libraries/webkitgtk/default.nix

···

       36
       36
        
       , readline

     

       37
       37
        
       , libGL

     

       38
       38
        
       , libGLU

     

       39
       39
       +
       , mesa

     

       39
       40
        
       , libintl

     

       40
       41
        
       , libmanette

     

       41
       42
        
       , openjpeg

     
···

       113
       114
        
           harfbuzz

     

       114
       115
        
           libGL

     

       115
       116
        
           libGLU

     

       117
       117
       +
           mesa # for libEGL headers

     

       116
       118
        
           libgcrypt

     

       117
       119
        
           libidn

     

       118
       120
        
           libintl

+2 -1

pkgs/development/web/cypress/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook }:

     

       1
       1
       +
       { stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook, mesa }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "cypress";

     
···

       18
       18
        
           libXScrnSaver libXdamage libXtst

     

       19
       19
        
         ] ++ [

     

       20
       20
        
           nss gtk2 alsaLib gnome2.GConf gtk3 unzip

     

       21
       21
       +
           mesa # for libgbm

     

       21
       22
        
         ];

     

       22
       23
        
       

     

       23
       24
        
         runtimeDependencies = [ (lib.getLib udev) ];

+2 -1

pkgs/development/web/insomnia/default.nix

···

       1
       1
        
       { lib, stdenv, makeWrapper, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat

     

       2
       2
       -
       , fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, gtk2

     

       2
       2
       +
       , fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, mesa, nspr, nss, gtk3, gtk2

     

       3
       3
        
       , at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook

     

       4
       4
        
       , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext

     

       5
       5
        
       , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2

     
···

       56
       56
        
           libXrender

     

       57
       57
        
           libXtst

     

       58
       58
        
           libxcb

     

       59
       59
       +
           mesa # for libgbm

     

       59
       60
        
           nspr

     

       60
       61
        
           nss

     

       61
       62
        
           stdenv.cc.cc

+1

pkgs/misc/emulators/pcsxr/default.nix

···

       52
       52
        
         nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ];

     

       53
       53
        
         buildInputs = [

     

       54
       54
        
           gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg file

     

       55
       55
       +
           xorg.libXxf86vm

     

       55
       56
        
         ];

     

       56
       57
        
       

     

       57
       58
        
         dynarecTarget =

+1 -1

pkgs/servers/x11/xorg/overrides.nix

···

       433
       433
        
         });

     

       434
       434
        
       

     

       435
       435
        
         xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: {

     

       436
       436
       -
           buildInputs =  attrs.buildInputs ++ [ mesa llvm ]; # for libxatracker

     

       436
       436
       +
           buildInputs =  attrs.buildInputs ++ [ mesa mesa.driversdev llvm ]; # for libxatracker

     

       437
       437
        
           meta = attrs.meta // {

     

       438
       438
        
             platforms = ["i686-linux" "x86_64-linux"];

     

       439
       439
        
           };

+2 -2

pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix

···

       1
       1
        
       { lib, clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, fetchgit

     

       2
       2
       -
       , python3Packages, mesa, ninja, pkg-config, protobuf, zinnia, qt5, fcitx5

     

       2
       2
       +
       , python3Packages, ninja, pkg-config, protobuf, zinnia, qt5, fcitx5

     

       3
       3
        
       , jsoncpp, gtest, which, gtk2, unzip, abseil-cpp, breakpad }:

     

       4
       4
        
       let

     

       5
       5
        
         inherit (python3Packages) python gyp six;

     
···

       31
       31
        
           sha256 = "R+w0slVFpqtt7PIr1pyupJjRoQsABVZiMdZ9fKGKAqw=";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
       -
         nativeBuildInputs = [ gyp ninja mesa python pkg-config qt5.wrapQtAppsHook six which unzip ];

     

       34
       34
       +
         nativeBuildInputs = [ gyp ninja python pkg-config qt5.wrapQtAppsHook six which unzip ];

     

       35
       35
        
       

     

       36
       36
        
         buildInputs = [ protobuf zinnia qt5.qtbase fcitx5 abseil-cpp jsoncpp gtest gtk2 ];

     

       37
       37