JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

epoxy: rename to libepoxy

Browse Source 
https://github.com/NixOS/nixpkgs/issues/145040
This commit is contained in:
Kerstin Humm 2021-11-11 05:35:34 +01:00
parent 62b9b0d9e8
commit bb799694db
No known key found for this signature in database
GPG Key ID: 40293358C7B9326B
64 changed files with 123 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/ChowKick/default.nix
View File

@ -4,7 +4,7 @@
, cmake , cmake
, curl , curl
, dbus , dbus
, epoxy , libepoxy
, fetchFromGitHub , fetchFromGitHub
, freeglut , freeglut
, freetype , freetype
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
brotli brotli
curl curl
dbus dbus
epoxy libepoxy
freeglut freeglut
freetype freetype
gtk2-x11 gtk2-x11

4
pkgs/applications/audio/audacity/default.nix
View File

@ -32,7 +32,7 @@
, linuxHeaders , linuxHeaders
, at-spi2-core , at-spi2-core
, dbus , dbus
, epoxy , libepoxy
, libXdmcp , libXdmcp
, libXtst , libXtst
, libpthreadstubs , libpthreadstubs
@ -143,7 +143,7 @@ stdenv.mkDerivation rec {
] ++ optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
at-spi2-core at-spi2-core
dbus dbus
epoxy libepoxy
libXdmcp libXdmcp
libXtst libXtst
libpthreadstubs libpthreadstubs

4
pkgs/applications/audio/hybridreverb2/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkg-config, lv2, alsa-lib, libjack2, { lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkg-config, lv2, alsa-lib, libjack2,
freetype, libX11, gtk3, pcre, libpthreadstubs, libXdmcp, libxkbcommon, freetype, libX11, gtk3, pcre, libpthreadstubs, libXdmcp, libxkbcommon,
epoxy, at-spi2-core, dbus, curl, fftwFloat }: libepoxy, at-spi2-core, dbus, curl, fftwFloat }:
let let
pname = "HybridReverb2"; pname = "HybridReverb2";
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ]; nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ lv2 alsa-lib libjack2 freetype libX11 gtk3 pcre buildInputs = [ lv2 alsa-lib libjack2 freetype libX11 gtk3 pcre
libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus curl fftwFloat ]; libpthreadstubs libXdmcp libxkbcommon libepoxy at-spi2-core dbus curl fftwFloat ];
cmakeFlags = [ cmakeFlags = [
"-DHybridReverb2_AdvancedJackStandalone=ON" "-DHybridReverb2_AdvancedJackStandalone=ON"

4
pkgs/applications/audio/tenacity/default.nix
View File

@ -35,7 +35,7 @@
, linuxHeaders , linuxHeaders
, at-spi2-core , at-spi2-core
, dbus , dbus
, epoxy , libepoxy
, libXdmcp , libXdmcp
, libXtst , libXtst
, libpthreadstubs , libpthreadstubs
@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
at-spi2-core at-spi2-core
dbus dbus
epoxy libepoxy
libXdmcp libXdmcp
libXtst libXtst
libpthreadstubs libpthreadstubs

4
pkgs/applications/audio/zrythm/default.nix
View File

@ -12,7 +12,7 @@
, cmake , cmake
, curl , curl
, dconf , dconf
, epoxy , libepoxy
, ffmpeg , ffmpeg
, fftw , fftw
, fftwFloat , fftwFloat
@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
chromaprint chromaprint
curl curl
dconf dconf
epoxy libepoxy
ffmpeg ffmpeg
fftw fftw
fftwFloat fftwFloat

4
pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter { lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter
, dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs , dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -27,7 +27,7 @@ stdenv.mkDerivation {
dbus dbus
gtk3 gtk3
pcre pcre
epoxy libepoxy
libgee libgee
libX11 libX11
lightdm lightdm

4
pkgs/applications/editors/jucipp/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm, { lib, stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm,
boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkg-config, pcre, boost, libepoxy, cmake, aspell, llvmPackages, libgit2, pkg-config, pcre,
libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3, libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3,
coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
gtksourceview3 gtksourceview3
at-spi2-core at-spi2-core
pcre pcre
epoxy libepoxy
boost boost
libXdmcp libXdmcp
cmake cmake

4
pkgs/applications/graphics/fbida/default.nix
View File

@ -16,7 +16,7 @@
, curl , curl
, sane-backends , sane-backends
, libXpm , libXpm
, epoxy , libepoxy
, poppler , poppler
, mesa , mesa
, lirc , lirc
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
sane-backends sane-backends
libdrm libdrm
libXpm libXpm
epoxy libepoxy
poppler poppler
lirc lirc
mesa mesa

4
pkgs/applications/graphics/megapixels/default.nix
View File

@ -6,7 +6,7 @@
, pkg-config , pkg-config
, glib , glib
, wrapGAppsHook , wrapGAppsHook
, epoxy , libepoxy
, gtk4 , gtk4
, zbar , zbar
, tiffSupport ? true , tiffSupport ? true
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
epoxy libepoxy
gtk4 gtk4
zbar zbar
]; ];

4
pkgs/applications/misc/apvlv/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, epoxy { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, libepoxy
, gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook , gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook
}: }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
poppler pcre libxkbcommon epoxy poppler pcre libxkbcommon libepoxy
freetype gtk3 freetype gtk3
libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation
]; ];

2
pkgs/applications/misc/lutris/fhsenv.nix
View File

@ -77,7 +77,7 @@ in buildFHSUserEnv {
nasm sndio nasm sndio
# Snes9x # Snes9x
epoxy minizip libepoxy minizip
# Vice # Vice
bison flex bison flex

4
pkgs/applications/misc/mysql-workbench/default.nix
View File

@ -33,7 +33,7 @@
, proj , proj
, cairo , cairo
, libxkbcommon , libxkbcommon
, epoxy , libepoxy
, wrapGAppsHook , wrapGAppsHook
, at-spi2-core , at-spi2-core
, dbus , dbus
@ -126,7 +126,7 @@ in stdenv.mkDerivation rec {
libpthreadstubs libpthreadstubs
libXdmcp libXdmcp
libxkbcommon libxkbcommon
epoxy libepoxy
at-spi2-core at-spi2-core
dbus dbus
]; ];

4
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -34,7 +34,7 @@
, libva , libva
, libdrm, wayland, libxkbcommon # Ozone , libdrm, wayland, libxkbcommon # Ozone
, curl , curl
, epoxy , libepoxy
# postPatch: # postPatch:
, glibc # gconv + locale , glibc # gconv + locale
@ -151,7 +151,7 @@ let
libdrm wayland mesa.drivers libxkbcommon libdrm wayland mesa.drivers libxkbcommon
curl curl
] ++ optionals (chromiumVersionAtLeast "96") [ ] ++ optionals (chromiumVersionAtLeast "96") [
epoxy libepoxy
] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ]
++ optional gnomeKeyringSupport libgnome-keyring3 ++ optional gnomeKeyringSupport libgnome-keyring3
++ optionals cupsSupport [ libgcrypt cups ] ++ optionals cupsSupport [ libgcrypt cups ]

4
pkgs/applications/networking/instant-messengers/dino/default.nix
View File

@ -5,7 +5,7 @@
, libnotify, libsoup, libgee , libnotify, libsoup, libgee
, librsvg, libsignal-protocol-c , librsvg, libsignal-protocol-c
, libgcrypt , libgcrypt
, epoxy , libepoxy
, at-spi2-core , at-spi2-core
, sqlite , sqlite
, dbus , dbus
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
libgcrypt libgcrypt
libsoup libsoup
pcre pcre
epoxy libepoxy
at-spi2-core at-spi2-core
dbus dbus
icu icu

4
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix
View File

@ -4,7 +4,7 @@
, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3
, tl-expected, hunspell, glibmm, webkitgtk , tl-expected, hunspell, glibmm, webkitgtk
# Transitive dependencies: # Transitive dependencies:
, pcre, xorg, util-linux, libselinux, libsepol, epoxy , pcre, xorg, util-linux, libselinux, libsepol, libepoxy
, at-spi2-core, libXtst, libthai, libdatrie , at-spi2-core, libXtst, libthai, libdatrie
}: }:
@ -41,7 +41,7 @@ in mkDerivation rec {
tl-expected hunspell glibmm webkitgtk tl-expected hunspell glibmm webkitgtk
tg_owt tg_owt
# Transitive dependencies: # Transitive dependencies:
pcre xorg.libXdmcp util-linux libselinux libsepol epoxy pcre xorg.libXdmcp util-linux libselinux libsepol libepoxy
at-spi2-core libXtst libthai libdatrie at-spi2-core libXtst libthai libdatrie
]; ];

4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -37,7 +37,7 @@
, libXdmcp , libXdmcp
, libselinux , libselinux
, libsepol , libsepol
, epoxy , libepoxy
, at-spi2-core , at-spi2-core
, libXtst , libXtst
, libthai , libthai
@ -135,7 +135,7 @@ mkDerivation rec {
libXdmcp libXdmcp
libselinux libselinux
libsepol libsepol
epoxy libepoxy
at-spi2-core at-spi2-core
libXtst libXtst
libthai libthai

4
pkgs/applications/networking/remote/nice-dcv-client/default.nix
View File

@ -4,7 +4,7 @@
, libX11 , libX11
, gst_all_1 , gst_all_1
, sqlite , sqlite
, epoxy , libepoxy
, pango , pango
, cairo , cairo
, gdk-pixbuf , gdk-pixbuf
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
pcsclite pcsclite
gtk3 gtk3
cairo cairo
epoxy libepoxy
pango pango
gdk-pixbuf gdk-pixbuf
gst_all_1.gstreamer gst_all_1.gstreamer

4
pkgs/applications/networking/remote/remmina/default.nix
View File

@ -3,7 +3,7 @@
, freerdp, libssh, libgcrypt, gnutls , freerdp, libssh, libgcrypt, gnutls
, pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , pcre2, libdbusmenu-gtk3, libappindicator-gtk3
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core , libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core
, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz
# The themes here are soft dependencies; only icons are missing without them. # The themes here are soft dependencies; only icons are missing without them.
, gnome , gnome
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
freerdp libssh libgcrypt gnutls freerdp libssh libgcrypt gnutls
pcre2 libdbusmenu-gtk3 libappindicator-gtk3 pcre2 libdbusmenu-gtk3 libappindicator-gtk3
libvncserver libpthreadstubs libXdmcp libxkbcommon libvncserver libpthreadstubs libXdmcp libxkbcommon
libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core libsecret libsoup spice-protocol spice-gtk libepoxy at-spi2-core
openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk
harfbuzz harfbuzz
]; ];

4
pkgs/applications/office/libreoffice/default.nix
View File

@ -12,7 +12,7 @@
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
, librevenge, libe-book, libmwaw, glm, gst_all_1 , librevenge, libe-book, libmwaw, glm, gst_all_1
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
, gnome, glib, ncurses, epoxy, gpgme , gnome, glib, ncurses, libepoxy, gpgme
, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ] , langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ]
, withHelp ? true , withHelp ? true
, kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null
@ -394,7 +394,7 @@ in (mkDrv rec {
python3 sane-backends unzip which zip zlib python3 sane-backends unzip which zip zlib
mdds bluez5 libwps libabw libzmf mdds bluez5 libwps libabw libzmf
libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux
librevenge libe-book libmwaw glm ncurses epoxy librevenge libe-book libmwaw glm ncurses libepoxy
libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext
] ]
++ (with gst_all_1; [ ++ (with gst_all_1; [

4
pkgs/applications/science/electronics/horizon-eda/default.nix
View File

@ -3,7 +3,7 @@
, coreutils , coreutils
, cppzmq , cppzmq
, curl , curl
, epoxy , libepoxy
, fetchFromGitHub , fetchFromGitHub
, glm , glm
, gtkmm3 , gtkmm3
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
cppzmq cppzmq
curl curl
epoxy libepoxy
glm glm
gtkmm3 gtkmm3
libgit2 libgit2

4
pkgs/applications/science/electronics/kicad/base.nix
View File

@ -27,7 +27,7 @@
, libthai , libthai
, libdatrie , libdatrie
, libxkbcommon , libxkbcommon
, epoxy , libepoxy
, dbus , dbus
, at-spi2-core , at-spi2-core
, libXtst , libXtst
@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
libthai libthai
libdatrie libdatrie
libxkbcommon libxkbcommon
epoxy libepoxy
dbus.daemon dbus.daemon
at-spi2-core at-spi2-core
libXtst libXtst

4
pkgs/applications/terminal-emulators/roxterm/default.nix
View File

@ -1,4 +1,4 @@
{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub { at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, libepoxy, fetchpatch, fetchFromGitHub
, glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs , glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs
, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2 , libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2
, pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto , pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp
util-linuxMinimal glib docbook_xsl xmlto libselinux util-linuxMinimal glib docbook_xsl xmlto libselinux
libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit libsepol libxkbcommon libepoxy at-spi2-core libXtst libtasn1 p11-kit
]; ];
meta = with lib; { meta = with lib; {

4
pkgs/applications/video/celluloid/default.nix
View File

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, appstream-glib , appstream-glib
, desktop-file-utils , desktop-file-utils
, epoxy , libepoxy
, gettext , gettext
, glib , glib
, gtk3 , gtk3
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
wrapGAppsHook wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
epoxy libepoxy
glib glib
gtk3 gtk3
mpv mpv

4
pkgs/applications/video/entangle/default.nix
View File

@ -12,7 +12,7 @@
, at-spi2-core , at-spi2-core
, dbus , dbus
, elfutils , elfutils
, epoxy , libepoxy
, gexiv2 , gexiv2
, glib , glib
, gobject-introspection , gobject-introspection
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
at-spi2-core at-spi2-core
dbus dbus
epoxy libepoxy
elfutils elfutils
gexiv2 gexiv2
glib glib

4
pkgs/applications/virtualization/qemu/default.nix
View File

@ -18,7 +18,7 @@
, xenSupport ? false, xen , xenSupport ? false, xen
, cephSupport ? false, ceph , cephSupport ? false, ceph
, glusterfsSupport ? false, glusterfs, libuuid , glusterfsSupport ? false, glusterfs, libuuid
, openGLSupport ? sdlSupport, mesa, epoxy, libdrm , openGLSupport ? sdlSupport, mesa, libepoxy, libdrm
, virglSupport ? openGLSupport, virglrenderer , virglSupport ? openGLSupport, virglrenderer
, libiscsiSupport ? true, libiscsi , libiscsiSupport ? true, libiscsi
, smbdSupport ? false, samba , smbdSupport ? false, samba
@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
++ lib.optionals xenSupport [ xen ] ++ lib.optionals xenSupport [ xen ]
++ lib.optionals cephSupport [ ceph ] ++ lib.optionals cephSupport [ ceph ]
++ lib.optionals glusterfsSupport [ glusterfs libuuid ] ++ lib.optionals glusterfsSupport [ glusterfs libuuid ]
++ lib.optionals openGLSupport [ mesa epoxy libdrm ] ++ lib.optionals openGLSupport [ mesa libepoxy libdrm ]
++ lib.optionals virglSupport [ virglrenderer ] ++ lib.optionals virglSupport [ virglrenderer ]
++ lib.optionals libiscsiSupport [ libiscsi ] ++ lib.optionals libiscsiSupport [ libiscsi ]
++ lib.optionals smbdSupport [ samba ]; ++ lib.optionals smbdSupport [ samba ];

4
pkgs/desktops/arcan/xarcan/default.nix
View File

@ -4,7 +4,7 @@
, arcan , arcan
, audit , audit
, dbus , dbus
, epoxy , libepoxy
, fontutil , fontutil
, libGL , libGL
, libX11 , libX11
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
arcan arcan
audit audit
dbus dbus
epoxy libepoxy
fontutil fontutil
libGL libGL
libX11 libX11

4
pkgs/desktops/gnome/core/gnome-control-center/default.nix
View File

@ -60,7 +60,7 @@
, tzdata , tzdata
, udisks2 , udisks2
, upower , upower
, epoxy , libepoxy
, gnome-user-share , gnome-user-share
, gnome-remote-desktop , gnome-remote-desktop
, wrapGAppsHook , wrapGAppsHook
@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
clutter-gtk clutter-gtk
colord colord
colord-gtk colord-gtk
epoxy libepoxy
fontconfig fontconfig
gdk-pixbuf gdk-pixbuf
glib glib

4
pkgs/desktops/gnome/core/gnome-session/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome, glib, gtk3, gsettings-desktop-schemas { fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome, glib, gtk3, gsettings-desktop-schemas
, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }: , libxslt, gettext, makeWrapper, systemd, xorg, libepoxy, gnugrep, bash, gnome-session-ctl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-session"; pname = "gnome-session";
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome.adwaita-icon-theme glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome.adwaita-icon-theme
gnome.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy gnome.gnome-settings-daemon gsettings-desktop-schemas systemd libepoxy
]; ];
postPatch = '' postPatch = ''

4
pkgs/desktops/gnome/core/sushi/default.nix
View File

@ -17,7 +17,7 @@
, gtk3 , gtk3
, harfbuzz , harfbuzz
, ninja , ninja
, epoxy , libepoxy
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf gdk-pixbuf
librsvg librsvg
webkitgtk_4_1 webkitgtk_4_1
epoxy libepoxy
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-good

4
pkgs/desktops/mate/mate-session-manager/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd, { lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd,
libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate, libSM, libXtst, gtk3, libepoxy, polkit, hicolor-icon-theme, mate,
wrapGAppsHook, fetchpatch, mateUpdateScript wrapGAppsHook, fetchpatch, mateUpdateScript
}: }:
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
gtk3 gtk3
mate.mate-desktop mate.mate-desktop
hicolor-icon-theme hicolor-icon-theme
epoxy libepoxy
polkit polkit
]; ];

4
pkgs/desktops/plasma-5/kwin/default.nix
View File

@ -2,7 +2,7 @@
mkDerivation, lib, mkDerivation, lib,
extra-cmake-modules, kdoctools, fetchpatch, extra-cmake-modules, kdoctools, fetchpatch,
epoxy, lcms2, libICE, libSM, libcap, libdrm, libinput, libxkbcommon, mesa, libepoxy, lcms2, libICE, libSM, libcap, libdrm, libinput, libxkbcommon, mesa,
pipewire, udev, wayland, xcb-util-cursor, xwayland, pipewire, udev, wayland, xcb-util-cursor, xwayland,
qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors, qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors,
@ -21,7 +21,7 @@ mkDerivation {
name = "kwin"; name = "kwin";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
epoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire libepoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire
udev wayland xcb-util-cursor xwayland udev wayland xcb-util-cursor xwayland
qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors

4
pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, lib, mkDerivation, lib,
extra-cmake-modules, gettext, kdoctools, extra-cmake-modules, gettext, kdoctools,
cups, epoxy, mesa, pcre, pipewire, wayland, wayland-protocols, cups, libepoxy, mesa, pcre, pipewire, wayland, wayland-protocols,
kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem,
kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio, kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio,
qtbase qtbase
@ -11,7 +11,7 @@ mkDerivation {
name = "xdg-desktop-portal-kde"; name = "xdg-desktop-portal-kde";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ];
buildInputs = [ buildInputs = [
cups epoxy mesa pcre pipewire wayland wayland-protocols cups libepoxy mesa pcre pipewire wayland wayland-protocols
kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem
kirigami2 kdeclarative plasma-framework plasma-wayland-protocols kirigami2 kdeclarative plasma-framework plasma-wayland-protocols

4
pkgs/desktops/xfce/core/libxfce4ui/default.nix
View File

@ -1,5 +1,5 @@
{ lib, mkXfceDerivation, gobject-introspection, vala, gtk3, libICE, libSM { lib, mkXfceDerivation, gobject-introspection, vala, gtk3, libICE, libSM
, libstartup_notification, libgtop, epoxy, libxfce4util, xfconf }: , libstartup_notification, libgtop, libepoxy, libxfce4util, xfconf }:
mkXfceDerivation { mkXfceDerivation {
category = "xfce"; category = "xfce";
@ -9,7 +9,7 @@ mkXfceDerivation {
sha256 = "sha256-5mwyC3YA1LvdVSvaHN7CXDJh+IXjmdHGLKzhpjtUZkw="; sha256 = "sha256-5mwyC3YA1LvdVSvaHN7CXDJh+IXjmdHGLKzhpjtUZkw=";
nativeBuildInputs = [ gobject-introspection vala ]; nativeBuildInputs = [ gobject-introspection vala ];
buildInputs = [ gtk3 libstartup_notification libgtop epoxy xfconf ]; buildInputs = [ gtk3 libstartup_notification libgtop libepoxy xfconf ];
propagatedBuildInputs = [ libxfce4util libICE libSM ]; propagatedBuildInputs = [ libxfce4util libICE libSM ];
configureFlags = [ configureFlags = [

4
pkgs/desktops/xfce/core/xfwm4/default.nix
View File

@ -1,4 +1,4 @@
{ mkXfceDerivation, exo, librsvg, dbus-glib, epoxy, gtk3, libXdamage { mkXfceDerivation, exo, librsvg, dbus-glib, libepoxy, gtk3, libXdamage
, libstartup_notification, libxfce4ui, libxfce4util, libwnck , libstartup_notification, libxfce4ui, libxfce4util, libwnck
, libXpresent, xfconf }: , libXpresent, xfconf }:
@ -13,7 +13,7 @@ mkXfceDerivation {
buildInputs = [ buildInputs = [
dbus-glib dbus-glib
epoxy libepoxy
gtk3 gtk3
libXdamage libXdamage
libstartup_notification libstartup_notification

4
pkgs/development/libraries/gthree/default.nix
View File

@ -11,7 +11,7 @@
, glib , glib
, gtk3 , gtk3
, graphene , graphene
, epoxy , libepoxy
, json-glib , json-glib
}: }:
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
epoxy libepoxy
json-glib json-glib
]; ];

4
pkgs/development/libraries/gtk/3.x.nix
View File

@ -24,7 +24,7 @@
, gobject-introspection , gobject-introspection
, fribidi , fribidi
, xorg , xorg
, epoxy , libepoxy
, libxkbcommon , libxkbcommon
, libxml2 , libxml2
, gmp , gmp
@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libxkbcommon libxkbcommon
epoxy libepoxy
isocodes isocodes
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
AppKit AppKit

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

@ -21,7 +21,7 @@
, fribidi , fribidi
, harfbuzz , harfbuzz
, xorg , xorg
, epoxy , libepoxy
, libxkbcommon , libxkbcommon
, libxml2 , libxml2
, gnome , gnome
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libxkbcommon libxkbcommon
epoxy libepoxy
isocodes isocodes
] ++ lib.optionals vulkanSupport [ ] ++ lib.optionals vulkanSupport [
vulkan-headers vulkan-headers

4
pkgs/development/libraries/gtkmm/3.x.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome }: { lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, libepoxy, gnome }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gtkmm"; pname = "gtkmm";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkg-config meson ninja python3 ]; nativeBuildInputs = [ pkg-config meson ninja python3 ];
buildInputs = [ epoxy ]; buildInputs = [ libepoxy ];
propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];

4
pkgs/development/libraries/gtkmm/4.x.nix
View File

@ -9,7 +9,7 @@
, glibmm_2_68 , glibmm_2_68
, cairomm_1_16 , cairomm_1_16
, pangomm_2_48 , pangomm_2_48
, epoxy , libepoxy
, gnome , gnome
, makeFontsConf , makeFontsConf
, xvfb-run , xvfb-run
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
epoxy libepoxy
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/libraries/kde-frameworks/kdeclarative.nix
View File

@ -1,6 +1,6 @@
{ {
mkDerivation, extra-cmake-modules, mkDerivation, extra-cmake-modules,
epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage, libepoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage,
kwidgetsaddons, kwindowsystem, qtdeclarative kwidgetsaddons, kwindowsystem, qtdeclarative
}: }:
@ -8,7 +8,7 @@ mkDerivation {
name = "kdeclarative"; name = "kdeclarative";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ buildInputs = [
epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons libepoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons
kwindowsystem kwindowsystem
]; ];
propagatedBuildInputs = [ kconfig kpackage qtdeclarative ]; propagatedBuildInputs = [ kconfig kpackage qtdeclarative ];

4
pkgs/development/libraries/epoxy/default.nix → pkgs/development/libraries/libepoxy/default.nix
View File

@ -5,12 +5,12 @@
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "epoxy"; pname = "libepoxy";
version = "1.5.4"; version = "1.5.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "anholt"; owner = "anholt";
repo = "libepoxy"; repo = pname;
rev = version; rev = version;
sha256 = "0rmg0qlswn250h0arx434jh3hwzsr95lawanpmh1czsfvrcx59l6"; sha256 = "0rmg0qlswn250h0arx434jh3hwzsr95lawanpmh1czsfvrcx59l6";
}; };

0
pkgs/development/libraries/epoxy/libgl-path.patch → pkgs/development/libraries/libepoxy/libgl-path.patch
View File

4
pkgs/development/libraries/libplacebo/default.nix
View File

@ -9,7 +9,7 @@
, shaderc , shaderc
, glslang , glslang
, lcms2 , lcms2
, epoxy , libepoxy
, libGL , libGL
, xorg , xorg
}: }:
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
shaderc shaderc
glslang glslang
lcms2 lcms2
epoxy libepoxy
libGL libGL
xorg.libX11 xorg.libX11
]; ];

4
pkgs/development/libraries/libwpe/fdo.nix
View File

@ -5,7 +5,7 @@
, pkg-config , pkg-config
, ninja , ninja
, wayland , wayland
, epoxy , libepoxy
, glib , glib
, libwpe , libwpe
, libxkbcommon , libxkbcommon
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
wayland wayland
epoxy libepoxy
glib glib
libwpe libwpe
libxkbcommon libxkbcommon

4
pkgs/development/libraries/movit/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkg-config }: { lib, stdenv, fetchurl, SDL2, eigen, libepoxy, fftw, gtest, pkg-config }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "movit"; pname = "movit";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
GTEST_DIR = "${gtest.src}/googletest"; GTEST_DIR = "${gtest.src}/googletest";
propagatedBuildInputs = [ eigen epoxy ]; propagatedBuildInputs = [ eigen libepoxy ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ SDL2 fftw gtest ]; buildInputs = [ SDL2 fftw gtest ];

4
pkgs/development/libraries/retro-gtk/default.nix
View File

@ -5,7 +5,7 @@
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, epoxy , libepoxy
, glib , glib
, gtk3 , gtk3
, libpulseaudio , libpulseaudio
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
epoxy libepoxy
glib glib
gtk3 gtk3
libpulseaudio libpulseaudio

4
pkgs/development/libraries/spice-gtk/default.nix
View File

@ -3,7 +3,7 @@
, acl , acl
, cyrus_sasl , cyrus_sasl
, docbook_xsl , docbook_xsl
, epoxy , libepoxy
, gettext , gettext
, gobject-introspection , gobject-introspection
, gst_all_1 , gst_all_1
@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
cyrus_sasl cyrus_sasl
epoxy libepoxy
gtk3 gtk3
json-glib json-glib
libcacard libcacard

4
pkgs/development/libraries/virglrenderer/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, cmake, meson, ninja, pkg-config, python3 { lib, stdenv, fetchurl, cmake, meson, ninja, pkg-config, python3
, libGLU, epoxy, libX11, libdrm, mesa , libGLU, libepoxy, libX11, libdrm, mesa
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1h76a1ylhh4niq33sa5knx033sr4k2816vibh4m58j54y7qc6346"; sha256 = "1h76a1ylhh4niq33sa5knx033sr4k2816vibh4m58j54y7qc6346";
}; };
buildInputs = [ libGLU epoxy libX11 libdrm mesa ]; buildInputs = [ libGLU libepoxy libX11 libdrm mesa ];
nativeBuildInputs = [ cmake meson ninja pkg-config python3 ]; nativeBuildInputs = [ cmake meson ninja pkg-config python3 ];

4
pkgs/development/libraries/webkitgtk/default.nix
View File

@ -21,7 +21,7 @@
, enchant2 , enchant2
, xorg , xorg
, libxkbcommon , libxkbcommon
, epoxy , libepoxy
, at-spi2-core , at-spi2-core
, libxml2 , libxml2
, libsoup , libsoup
@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
at-spi2-core at-spi2-core
enchant2 enchant2
epoxy libepoxy
gnutls gnutls
gst-plugins-bad gst-plugins-bad
gst-plugins-base gst-plugins-base

4
pkgs/games/arx-libertatis/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, zlib, boost { lib, stdenv, fetchFromGitHub, cmake, zlib, boost
, openal, glm, freetype, libGLU, SDL2, epoxy , openal, glm, freetype, libGLU, SDL2, libepoxy
, dejavu_fonts, inkscape, optipng, imagemagick , dejavu_fonts, inkscape, optipng, imagemagick
, withCrashReporter ? !stdenv.isDarwin , withCrashReporter ? !stdenv.isDarwin
, qtbase ? null , qtbase ? null
@ -27,7 +27,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
zlib boost openal glm zlib boost openal glm
freetype libGLU SDL2 epoxy freetype libGLU SDL2 libepoxy
] ++ optionals withCrashReporter [ qtbase curl ] ] ++ optionals withCrashReporter [ qtbase curl ]
++ optionals stdenv.isLinux [ gdb ]; ++ optionals stdenv.isLinux [ gdb ];

4
pkgs/games/gnome-hexgl/default.nix
View File

@ -5,7 +5,7 @@
, pkg-config , pkg-config
, gthree , gthree
, gsound , gsound
, epoxy , libepoxy
, gtk3 , gtk3
}: }:
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gthree gthree
gsound gsound
epoxy libepoxy
gtk3 gtk3
]; ];

4
pkgs/games/performous/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext
, glibmm, libxmlxx, pango, librsvg , glibmm, libxmlxx, pango, librsvg
, SDL2, glew, boost, ffmpeg, portaudio, epoxy , SDL2, glew, boost, ffmpeg, portaudio, libepoxy
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glibmm libxmlxx pango librsvg glibmm libxmlxx pango librsvg
SDL2 glew boost ffmpeg portaudio epoxy SDL2 glew boost ffmpeg portaudio libepoxy
]; ];
} }

4
pkgs/misc/emulators/melonDS/default.nix
View File

@ -2,7 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, mkDerivation , mkDerivation
, cmake , cmake
, epoxy , libepoxy
, libarchive , libarchive
, libpcap , libpcap
, libslirp , libslirp
@ -24,7 +24,7 @@ mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ buildInputs = [
epoxy libepoxy
libarchive libarchive
libslirp libslirp
qtbase qtbase

4
pkgs/misc/emulators/mgba/default.nix
View File

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, SDL2 , SDL2
, cmake , cmake
, epoxy , libepoxy
, ffmpeg , ffmpeg
, imagemagick , imagemagick
, libedit , libedit
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
SDL2 SDL2
epoxy libepoxy
ffmpeg ffmpeg
imagemagick imagemagick
libedit libedit

4
pkgs/misc/emulators/nestopia/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsa-lib, gtk3 { lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsa-lib, gtk3
, makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils , makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils
, epoxy, gdk-pixbuf, gnome, wrapGAppsHook , libepoxy, gdk-pixbuf, gnome, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
SDL2 SDL2
alsa-lib alsa-lib
epoxy libepoxy
gtk3 gtk3
gdk-pixbuf gdk-pixbuf
libGLU libGL libGLU libGL

4
pkgs/misc/emulators/snes9x-gtk/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsHook { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsHook
, SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, pulseaudio, portaudio }: , SDL2, zlib, gtk3, libxml2, libXv, libepoxy, minizip, pulseaudio, portaudio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "snes9x-gtk"; pname = "snes9x-gtk";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];
buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip pulseaudio portaudio ]; buildInputs = [ SDL2 zlib gtk3 libxml2 libXv libepoxy minizip pulseaudio portaudio ];
preConfigure = "cd gtk"; preConfigure = "cd gtk";

4
pkgs/os-specific/linux/amdgpu-pro/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, elfutils { lib, stdenv, fetchurl, elfutils
, xorg, patchelf, openssl, libdrm, udev , xorg, patchelf, openssl, libdrm, udev
, libxcb, libxshmfence, epoxy, perl, zlib , libxcb, libxshmfence, libepoxy, perl, zlib
, ncurses , ncurses
, libsOnly ? false, kernel ? null , libsOnly ? false, kernel ? null
}: }:
@ -101,7 +101,7 @@ in stdenv.mkDerivation rec {
depLibPath = makeLibraryPath [ depLibPath = makeLibraryPath [
stdenv.cc.cc.lib xorg.libXext xorg.libX11 xorg.libXdamage xorg.libXfixes zlib stdenv.cc.cc.lib xorg.libXext xorg.libX11 xorg.libXdamage xorg.libXfixes zlib
xorg.libXxf86vm libxcb libxshmfence epoxy openssl libdrm elfutils udev ncurses5 xorg.libXxf86vm libxcb libxshmfence libepoxy openssl libdrm elfutils udev ncurses5
]; ];
installPhase = '' installPhase = ''

4
pkgs/servers/x11/xorg/overrides.nix
View File

@ -4,7 +4,7 @@
freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge,
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
mcpp, epoxy, openssl, pkg-config, llvm, libxslt, mcpp, libepoxy, openssl, pkg-config, llvm, libxslt,
ApplicationServices, Carbon, Cocoa, Xplugin ApplicationServices, Carbon, Cocoa, Xplugin
}: }:
@ -650,7 +650,7 @@ self: super:
./dont-create-logdir-during-build.patch ./dont-create-logdir-during-build.patch
]; ];
buildInputs = commonBuildInputs ++ [ libdrm mesa ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ];
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess libepoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
udev udev
]; ];
prePatch = lib.optionalString stdenv.hostPlatform.isMusl '' prePatch = lib.optionalString stdenv.hostPlatform.isMusl ''

4
pkgs/servers/x11/xorg/xwayland.nix
View File

@ -1,5 +1,5 @@
{ egl-wayland { egl-wayland
, epoxy , libepoxy
, fetchurl , fetchurl
, fontutil , fontutil
, lib , lib
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
egl-wayland egl-wayland
epoxy libepoxy
fontutil fontutil
libGL libGL
libGLU libGLU

4
pkgs/tools/graphics/gromit-mpx/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config { lib, stdenv, fetchFromGitHub, cmake, pkg-config
, gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp
, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu , libxkbcommon, libepoxy, at-spi2-core, dbus, libdbusmenu
, wrapGAppsHook , wrapGAppsHook
}: }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ];
buildInputs = [ buildInputs = [
gtk glib pcre libappindicator libpthreadstubs gtk glib pcre libappindicator libpthreadstubs
libXdmcp libxkbcommon epoxy at-spi2-core libXdmcp libxkbcommon libepoxy at-spi2-core
dbus libdbusmenu dbus libdbusmenu
]; ];

4
pkgs/tools/graphics/wdisplays/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook }: { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, libepoxy, wayland, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wdisplays"; pname = "wdisplays";
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];
buildInputs = [ gtk3 epoxy wayland ]; buildInputs = [ gtk3 libepoxy wayland ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "luispabon"; owner = "luispabon";

4
pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
View File

@ -17,7 +17,7 @@
, libdatrie , libdatrie
, libXdmcp , libXdmcp
, libxkbcommon , libxkbcommon
, epoxy , libepoxy
, dbus , dbus
, at-spi2-core , at-spi2-core
, libXtst , libXtst
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
libdatrie libdatrie
libXdmcp libXdmcp
libxkbcommon libxkbcommon
epoxy libepoxy
dbus dbus
at-spi2-core at-spi2-core
libXtst libXtst

1
pkgs/top-level/aliases.nix
View File

@ -224,6 +224,7 @@ mapAliases ({
emacsPackages = emacs.pkgs; # added 2020-12-18 emacsPackages = emacs.pkgs; # added 2020-12-18
enblendenfuse = enblend-enfuse; # 2015-09-30 enblendenfuse = enblend-enfuse; # 2015-09-30
envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05 envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05
epoxy = libepoxy; # 2021-11-11
esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # added 2021-04-12 esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # added 2021-04-12
evolution_data_server = evolution-data-server; # added 2018-02-25 evolution_data_server = evolution-data-server; # added 2018-02-25
etcdctl = etcd; # added 2018-04-25 etcdctl = etcd; # added 2018-04-25

2
pkgs/top-level/all-packages.nix
View File

@ -16009,7 +16009,7 @@ with pkgs;
entt = callPackage ../development/libraries/entt { }; entt = callPackage ../development/libraries/entt { };
epoxy = callPackage ../development/libraries/epoxy {}; libepoxy = callPackage ../development/libraries/libepoxy {};
libesmtp = callPackage ../development/libraries/libesmtp { }; libesmtp = callPackage ../development/libraries/libesmtp { };