From bb799694db5480bf2d0c56d27ede14dc491ad377 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 11 Nov 2021 05:35:34 +0100 Subject: epoxy: rename to libepoxy https://github.com/NixOS/nixpkgs/issues/145040 --- pkgs/applications/audio/ChowKick/default.nix | 4 +-- pkgs/applications/audio/audacity/default.nix | 4 +-- pkgs/applications/audio/hybridreverb2/default.nix | 4 +-- pkgs/applications/audio/tenacity/default.nix | 4 +-- pkgs/applications/audio/zrythm/default.nix | 4 +-- .../lightdm-enso-os-greeter/default.nix | 4 +-- pkgs/applications/editors/jucipp/default.nix | 4 +-- pkgs/applications/graphics/fbida/default.nix | 4 +-- pkgs/applications/graphics/megapixels/default.nix | 4 +-- pkgs/applications/misc/apvlv/default.nix | 4 +-- pkgs/applications/misc/lutris/fhsenv.nix | 2 +- pkgs/applications/misc/mysql-workbench/default.nix | 4 +-- .../networking/browsers/chromium/common.nix | 4 +-- .../networking/instant-messengers/dino/default.nix | 4 +-- .../telegram/kotatogram-desktop/default.nix | 4 +-- .../telegram/tdesktop/default.nix | 4 +-- .../networking/remote/nice-dcv-client/default.nix | 4 +-- .../networking/remote/remmina/default.nix | 4 +-- pkgs/applications/office/libreoffice/default.nix | 4 +-- .../science/electronics/horizon-eda/default.nix | 4 +-- .../science/electronics/kicad/base.nix | 4 +-- .../terminal-emulators/roxterm/default.nix | 4 +-- pkgs/applications/video/celluloid/default.nix | 4 +-- pkgs/applications/video/entangle/default.nix | 4 +-- pkgs/applications/virtualization/qemu/default.nix | 4 +-- pkgs/desktops/arcan/xarcan/default.nix | 4 +-- .../gnome/core/gnome-control-center/default.nix | 4 +-- pkgs/desktops/gnome/core/gnome-session/default.nix | 4 +-- pkgs/desktops/gnome/core/sushi/default.nix | 4 +-- .../desktops/mate/mate-session-manager/default.nix | 4 +-- pkgs/desktops/plasma-5/kwin/default.nix | 4 +-- pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix | 4 +-- pkgs/desktops/xfce/core/libxfce4ui/default.nix | 4 +-- pkgs/desktops/xfce/core/xfwm4/default.nix | 4 +-- pkgs/development/libraries/epoxy/default.nix | 41 ---------------------- pkgs/development/libraries/epoxy/libgl-path.patch | 24 ------------- pkgs/development/libraries/gthree/default.nix | 4 +-- pkgs/development/libraries/gtk/3.x.nix | 4 +-- pkgs/development/libraries/gtk/4.x.nix | 4 +-- pkgs/development/libraries/gtkmm/3.x.nix | 4 +-- pkgs/development/libraries/gtkmm/4.x.nix | 4 +-- .../libraries/kde-frameworks/kdeclarative.nix | 4 +-- pkgs/development/libraries/libepoxy/default.nix | 41 ++++++++++++++++++++++ .../libraries/libepoxy/libgl-path.patch | 24 +++++++++++++ pkgs/development/libraries/libplacebo/default.nix | 4 +-- pkgs/development/libraries/libwpe/fdo.nix | 4 +-- pkgs/development/libraries/movit/default.nix | 4 +-- pkgs/development/libraries/retro-gtk/default.nix | 4 +-- pkgs/development/libraries/spice-gtk/default.nix | 4 +-- .../libraries/virglrenderer/default.nix | 4 +-- pkgs/development/libraries/webkitgtk/default.nix | 4 +-- pkgs/games/arx-libertatis/default.nix | 4 +-- pkgs/games/gnome-hexgl/default.nix | 4 +-- pkgs/games/performous/default.nix | 4 +-- pkgs/misc/emulators/melonDS/default.nix | 4 +-- pkgs/misc/emulators/mgba/default.nix | 4 +-- pkgs/misc/emulators/nestopia/default.nix | 4 +-- pkgs/misc/emulators/snes9x-gtk/default.nix | 4 +-- pkgs/os-specific/linux/amdgpu-pro/default.nix | 4 +-- pkgs/servers/x11/xorg/overrides.nix | 4 +-- pkgs/servers/x11/xorg/xwayland.nix | 4 +-- pkgs/tools/graphics/gromit-mpx/default.nix | 4 +-- pkgs/tools/graphics/wdisplays/default.nix | 4 +-- pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix | 4 +-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 66 files changed, 186 insertions(+), 185 deletions(-) delete mode 100644 pkgs/development/libraries/epoxy/default.nix delete mode 100644 pkgs/development/libraries/epoxy/libgl-path.patch create mode 100644 pkgs/development/libraries/libepoxy/default.nix create mode 100644 pkgs/development/libraries/libepoxy/libgl-path.patch (limited to 'pkgs') diff --git a/pkgs/applications/audio/ChowKick/default.nix b/pkgs/applications/audio/ChowKick/default.nix index 135ed3a11a1c9..b3ad00bf63a8a 100644 --- a/pkgs/applications/audio/ChowKick/default.nix +++ b/pkgs/applications/audio/ChowKick/default.nix @@ -4,7 +4,7 @@ , cmake , curl , dbus -, epoxy +, libepoxy , fetchFromGitHub , freeglut , freetype @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { brotli curl dbus - epoxy + libepoxy freeglut freetype gtk2-x11 diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 566024881b4a6..0832bb1dd9644 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -32,7 +32,7 @@ , linuxHeaders , at-spi2-core , dbus -, epoxy +, libepoxy , libXdmcp , libXtst , libpthreadstubs @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { ] ++ optionals stdenv.isLinux [ at-spi2-core dbus - epoxy + libepoxy libXdmcp libXtst libpthreadstubs diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix index c539a316422a5..3254a94ef1079 100644 --- a/pkgs/applications/audio/hybridreverb2/default.nix +++ b/pkgs/applications/audio/hybridreverb2/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkg-config, lv2, alsa-lib, libjack2, freetype, libX11, gtk3, pcre, libpthreadstubs, libXdmcp, libxkbcommon, - epoxy, at-spi2-core, dbus, curl, fftwFloat }: + libepoxy, at-spi2-core, dbus, curl, fftwFloat }: let pname = "HybridReverb2"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; 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 = [ "-DHybridReverb2_AdvancedJackStandalone=ON" diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index 160243cdf34f8..fbf13c1748ff4 100644 --- a/pkgs/applications/audio/tenacity/default.nix +++ b/pkgs/applications/audio/tenacity/default.nix @@ -35,7 +35,7 @@ , linuxHeaders , at-spi2-core , dbus -, epoxy +, libepoxy , libXdmcp , libXtst , libpthreadstubs @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ at-spi2-core dbus - epoxy + libepoxy libXdmcp libXtst libpthreadstubs diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index ee6eef5527f9d..480684525b110 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -12,7 +12,7 @@ , cmake , curl , dconf -, epoxy +, libepoxy , ffmpeg , fftw , fftwFloat @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { chromaprint curl dconf - epoxy + libepoxy ffmpeg fftw fftwFloat diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index f595e211dc2b1..ea7fc13757472 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,5 +1,5 @@ { 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 }: stdenv.mkDerivation { @@ -27,7 +27,7 @@ stdenv.mkDerivation { dbus gtk3 pcre - epoxy + libepoxy libgee libX11 lightdm diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 140bf04c9f365..7a57e21710950 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,5 +1,5 @@ { 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, coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gtksourceview3 at-spi2-core pcre - epoxy + libepoxy boost libXdmcp cmake diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 5f13136d0c8c5..5cd574bf9b79c 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -16,7 +16,7 @@ , curl , sane-backends , libXpm -, epoxy +, libepoxy , poppler , mesa , lirc @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { sane-backends libdrm libXpm - epoxy + libepoxy poppler lirc mesa diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index c949b8e6b4d01..ef2f20850d239 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -6,7 +6,7 @@ , pkg-config , glib , wrapGAppsHook -, epoxy +, libepoxy , gtk4 , zbar , tiffSupport ? true @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - epoxy + libepoxy gtk4 zbar ]; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 140d6eb7d086d..d7dde2a77ff51 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -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 }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - poppler pcre libxkbcommon epoxy + poppler pcre libxkbcommon libepoxy freetype gtk3 libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation ]; diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index bd35d44b7cccd..7722574720ffa 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -77,7 +77,7 @@ in buildFHSUserEnv { nasm sndio # Snes9x - epoxy minizip + libepoxy minizip # Vice bison flex diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 63dde76fabcc9..9ba9f360402bf 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -33,7 +33,7 @@ , proj , cairo , libxkbcommon -, epoxy +, libepoxy , wrapGAppsHook , at-spi2-core , dbus @@ -126,7 +126,7 @@ in stdenv.mkDerivation rec { libpthreadstubs libXdmcp libxkbcommon - epoxy + libepoxy at-spi2-core dbus ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e88c1fa1b94a1..193543ea54abd 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -34,7 +34,7 @@ , libva , libdrm, wayland, libxkbcommon # Ozone , curl -, epoxy +, libepoxy # postPatch: , glibc # gconv + locale @@ -151,7 +151,7 @@ let libdrm wayland mesa.drivers libxkbcommon curl ] ++ optionals (chromiumVersionAtLeast "96") [ - epoxy + libepoxy ] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals cupsSupport [ libgcrypt cups ] diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 18f73de2fd5b0..5e362784c811b 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -5,7 +5,7 @@ , libnotify, libsoup, libgee , librsvg, libsignal-protocol-c , libgcrypt -, epoxy +, libepoxy , at-spi2-core , sqlite , dbus @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libgcrypt libsoup pcre - epoxy + libepoxy at-spi2-core dbus icu diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index d9f9cd91a52da..cb4f3e5e5d156 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -4,7 +4,7 @@ , ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk # Transitive dependencies: -, pcre, xorg, util-linux, libselinux, libsepol, epoxy +, pcre, xorg, util-linux, libselinux, libsepol, libepoxy , at-spi2-core, libXtst, libthai, libdatrie }: @@ -41,7 +41,7 @@ in mkDerivation rec { tl-expected hunspell glibmm webkitgtk tg_owt # Transitive dependencies: - pcre xorg.libXdmcp util-linux libselinux libsepol epoxy + pcre xorg.libXdmcp util-linux libselinux libsepol libepoxy at-spi2-core libXtst libthai libdatrie ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 0764c484ec9a7..1611185ca7246 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -37,7 +37,7 @@ , libXdmcp , libselinux , libsepol -, epoxy +, libepoxy , at-spi2-core , libXtst , libthai @@ -135,7 +135,7 @@ mkDerivation rec { libXdmcp libselinux libsepol - epoxy + libepoxy at-spi2-core libXtst libthai diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/applications/networking/remote/nice-dcv-client/default.nix index 3344174cb2a01..82debe6f8a1a1 100644 --- a/pkgs/applications/networking/remote/nice-dcv-client/default.nix +++ b/pkgs/applications/networking/remote/nice-dcv-client/default.nix @@ -4,7 +4,7 @@ , libX11 , gst_all_1 , sqlite -, epoxy +, libepoxy , pango , cairo , gdk-pixbuf @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { pcsclite gtk3 cairo - epoxy + libepoxy pango gdk-pixbuf gst_all_1.gstreamer diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index f61a00f89ada0..11fcde29b8826 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -3,7 +3,7 @@ , freerdp, libssh, libgcrypt, gnutls , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , 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 # The themes here are soft dependencies; only icons are missing without them. , gnome @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { freerdp libssh libgcrypt gnutls pcre2 libdbusmenu-gtk3 libappindicator-gtk3 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 harfbuzz ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index f94beabd1f90d..b8cdf218e7838 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, gst_all_1 , 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" ] , withHelp ? true , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null @@ -394,7 +394,7 @@ in (mkDrv rec { python3 sane-backends unzip which zip zlib mdds bluez5 libwps libabw libzmf 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 ] ++ (with gst_all_1; [ diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index eec7830b2a157..30ef1f5d109df 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -3,7 +3,7 @@ , coreutils , cppzmq , curl -, epoxy +, libepoxy , fetchFromGitHub , glm , gtkmm3 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ cppzmq curl - epoxy + libepoxy glm gtkmm3 libgit2 diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 0b024d5c947ed..61fcff77e1c79 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -27,7 +27,7 @@ , libthai , libdatrie , libxkbcommon -, epoxy +, libepoxy , dbus , at-spi2-core , libXtst @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { libthai libdatrie libxkbcommon - epoxy + libepoxy dbus.daemon at-spi2-core libXtst diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix index fff534aaff1ae..c33e3fee704de 100644 --- a/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -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 , libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2 , pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp 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; { diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index f6bc0561b0c6c..e6dcff6717583 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , appstream-glib , desktop-file-utils -, epoxy +, libepoxy , gettext , glib , gtk3 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; buildInputs = [ - epoxy + libepoxy glib gtk3 mpv diff --git a/pkgs/applications/video/entangle/default.nix b/pkgs/applications/video/entangle/default.nix index 6d8905d2c0038..2c75633808950 100644 --- a/pkgs/applications/video/entangle/default.nix +++ b/pkgs/applications/video/entangle/default.nix @@ -12,7 +12,7 @@ , at-spi2-core , dbus , elfutils -, epoxy +, libepoxy , gexiv2 , glib , gobject-introspection @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ at-spi2-core dbus - epoxy + libepoxy elfutils gexiv2 glib diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 48b83140e42cd..fba8ecf9d9ad3 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -18,7 +18,7 @@ , xenSupport ? false, xen , cephSupport ? false, ceph , glusterfsSupport ? false, glusterfs, libuuid -, openGLSupport ? sdlSupport, mesa, epoxy, libdrm +, openGLSupport ? sdlSupport, mesa, libepoxy, libdrm , virglSupport ? openGLSupport, virglrenderer , libiscsiSupport ? true, libiscsi , smbdSupport ? false, samba @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ++ lib.optionals xenSupport [ xen ] ++ lib.optionals cephSupport [ ceph ] ++ lib.optionals glusterfsSupport [ glusterfs libuuid ] - ++ lib.optionals openGLSupport [ mesa epoxy libdrm ] + ++ lib.optionals openGLSupport [ mesa libepoxy libdrm ] ++ lib.optionals virglSupport [ virglrenderer ] ++ lib.optionals libiscsiSupport [ libiscsi ] ++ lib.optionals smbdSupport [ samba ]; diff --git a/pkgs/desktops/arcan/xarcan/default.nix b/pkgs/desktops/arcan/xarcan/default.nix index 9bfd7e290733b..6245471a7efd8 100644 --- a/pkgs/desktops/arcan/xarcan/default.nix +++ b/pkgs/desktops/arcan/xarcan/default.nix @@ -4,7 +4,7 @@ , arcan , audit , dbus -, epoxy +, libepoxy , fontutil , libGL , libX11 @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { arcan audit dbus - epoxy + libepoxy fontutil libGL libX11 diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index d60b64b78aabd..9ea727969b3e6 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -60,7 +60,7 @@ , tzdata , udisks2 , upower -, epoxy +, libepoxy , gnome-user-share , gnome-remote-desktop , wrapGAppsHook @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { clutter-gtk colord colord-gtk - epoxy + libepoxy fontconfig gdk-pixbuf glib diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix index c1ebc43620715..3ba6958fad0e3 100644 --- a/pkgs/desktops/gnome/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -1,6 +1,6 @@ { 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 -, 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 { pname = "gnome-session"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ 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 = '' diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix index f08f51512c473..49aa1a021cf87 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -17,7 +17,7 @@ , gtk3 , harfbuzz , ninja -, epoxy +, libepoxy }: stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { gdk-pixbuf librsvg webkitgtk_4_1 - epoxy + libepoxy gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 1c51e2f6ae89e..dba5c374f94ae 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,5 +1,5 @@ { 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 }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gtk3 mate.mate-desktop hicolor-icon-theme - epoxy + libepoxy polkit ]; diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 4e5ba348cd86f..36f0da9e96114 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -2,7 +2,7 @@ mkDerivation, lib, 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, qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors, @@ -21,7 +21,7 @@ mkDerivation { name = "kwin"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; 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 qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index f754bc5a46d4b..60d4867cb47f2 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, 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, kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio, qtbase @@ -11,7 +11,7 @@ mkDerivation { name = "xdg-desktop-portal-kde"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; buildInputs = [ - cups epoxy mesa pcre pipewire wayland wayland-protocols + cups libepoxy mesa pcre pipewire wayland wayland-protocols kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem kirigami2 kdeclarative plasma-framework plasma-wayland-protocols diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix index 0a937f68fd062..b70ef2788ac64 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui/default.nix @@ -1,5 +1,5 @@ { lib, mkXfceDerivation, gobject-introspection, vala, gtk3, libICE, libSM -, libstartup_notification, libgtop, epoxy, libxfce4util, xfconf }: +, libstartup_notification, libgtop, libepoxy, libxfce4util, xfconf }: mkXfceDerivation { category = "xfce"; @@ -9,7 +9,7 @@ mkXfceDerivation { sha256 = "sha256-5mwyC3YA1LvdVSvaHN7CXDJh+IXjmdHGLKzhpjtUZkw="; nativeBuildInputs = [ gobject-introspection vala ]; - buildInputs = [ gtk3 libstartup_notification libgtop epoxy xfconf ]; + buildInputs = [ gtk3 libstartup_notification libgtop libepoxy xfconf ]; propagatedBuildInputs = [ libxfce4util libICE libSM ]; configureFlags = [ diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index cc998487f1650..61e46d3047dec 100644 --- a/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -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 , libXpresent, xfconf }: @@ -13,7 +13,7 @@ mkXfceDerivation { buildInputs = [ dbus-glib - epoxy + libepoxy gtk3 libXdamage libstartup_notification diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix deleted file mode 100644 index 7ae0e73953f44..0000000000000 --- a/pkgs/development/libraries/epoxy/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, utilmacros, python3 -, libGL, libX11 -}: - -with lib; - -stdenv.mkDerivation rec { - pname = "epoxy"; - version = "1.5.4"; - - src = fetchFromGitHub { - owner = "anholt"; - repo = "libepoxy"; - rev = version; - sha256 = "0rmg0qlswn250h0arx434jh3hwzsr95lawanpmh1czsfvrcx59l6"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ autoreconfHook pkg-config utilmacros python3 ]; - buildInputs = [ libGL libX11 ]; - - preConfigure = optionalString stdenv.isDarwin '' - substituteInPlace configure --replace build_glx=no build_glx=yes - substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" - ''; - - patches = [ ./libgl-path.patch ]; - - NIX_CFLAGS_COMPILE = ''-DLIBGL_PATH="${getLib libGL}/lib"''; - - doCheck = false; # needs X11 - - meta = { - description = "A library for handling OpenGL function pointer management"; - homepage = "https://github.com/anholt/libepoxy"; - license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/epoxy/libgl-path.patch b/pkgs/development/libraries/epoxy/libgl-path.patch deleted file mode 100644 index 8f38ee27174b6..0000000000000 --- a/pkgs/development/libraries/epoxy/libgl-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/dispatch_common.c b/src/dispatch_common.c -index b3e4f5f..303e8f5 100644 ---- a/src/dispatch_common.c -+++ b/src/dispatch_common.c -@@ -310,6 +310,19 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail, bool l - flags |= RTLD_NOLOAD; - - *handle = dlopen(lib_name, flags); -+#ifdef LIBGL_PATH -+ if (!*handle) { -+ char pathbuf[sizeof(LIBGL_PATH) + 1 + 1024 + 1]; -+ int l = snprintf(pathbuf, sizeof(pathbuf), "%s/%s", LIBGL_PATH, lib_name); -+ if (l < 0 || l >= sizeof(pathbuf)) { -+ // This really shouldn't happen -+ fprintf(stderr, "Error prefixing library pathname\n"); -+ exit(1); -+ } -+ *handle = dlopen(pathbuf, flags); -+ } -+#endif -+ - if (!*handle) { - if (exit_on_fail) { - fprintf(stderr, "Couldn't open %s: %s\n", lib_name, dlerror()); diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix index 990e151efe444..a59541edb2570 100644 --- a/pkgs/development/libraries/gthree/default.nix +++ b/pkgs/development/libraries/gthree/default.nix @@ -11,7 +11,7 @@ , glib , gtk3 , graphene -, epoxy +, libepoxy , json-glib }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - epoxy + libepoxy json-glib ]; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 6fce8ca78e815..82bcad0b98564 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -24,7 +24,7 @@ , gobject-introspection , fribidi , xorg -, epoxy +, libepoxy , libxkbcommon , libxml2 , gmp @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon - epoxy + libepoxy isocodes ] ++ lib.optionals stdenv.isDarwin [ AppKit diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 78d9174d0953c..363d9b80a7f0f 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -21,7 +21,7 @@ , fribidi , harfbuzz , xorg -, epoxy +, libepoxy , libxkbcommon , libxml2 , gnome @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon - epoxy + libepoxy isocodes ] ++ lib.optionals vulkanSupport [ vulkan-headers diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 734cf833fd846..2d0921cf097fb 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -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 { pname = "gtkmm"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config meson ninja python3 ]; - buildInputs = [ epoxy ]; + buildInputs = [ libepoxy ]; propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index 67afc4026d1ac..c1bac87a6c08d 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -9,7 +9,7 @@ , glibmm_2_68 , cairomm_1_16 , pangomm_2_48 -, epoxy +, libepoxy , gnome , makeFontsConf , xvfb-run @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - epoxy + libepoxy ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix index cc4e269982121..1389df5eb1528 100644 --- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix @@ -1,6 +1,6 @@ { mkDerivation, extra-cmake-modules, - epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage, + libepoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage, kwidgetsaddons, kwindowsystem, qtdeclarative }: @@ -8,7 +8,7 @@ mkDerivation { name = "kdeclarative"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons + libepoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons kwindowsystem ]; propagatedBuildInputs = [ kconfig kpackage qtdeclarative ]; diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix new file mode 100644 index 0000000000000..d0612e1160e2c --- /dev/null +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, utilmacros, python3 +, libGL, libX11 +}: + +with lib; + +stdenv.mkDerivation rec { + pname = "libepoxy"; + version = "1.5.4"; + + src = fetchFromGitHub { + owner = "anholt"; + repo = pname; + rev = version; + sha256 = "0rmg0qlswn250h0arx434jh3hwzsr95lawanpmh1czsfvrcx59l6"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ autoreconfHook pkg-config utilmacros python3 ]; + buildInputs = [ libGL libX11 ]; + + preConfigure = optionalString stdenv.isDarwin '' + substituteInPlace configure --replace build_glx=no build_glx=yes + substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" + ''; + + patches = [ ./libgl-path.patch ]; + + NIX_CFLAGS_COMPILE = ''-DLIBGL_PATH="${getLib libGL}/lib"''; + + doCheck = false; # needs X11 + + meta = { + description = "A library for handling OpenGL function pointer management"; + homepage = "https://github.com/anholt/libepoxy"; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libepoxy/libgl-path.patch b/pkgs/development/libraries/libepoxy/libgl-path.patch new file mode 100644 index 0000000000000..8f38ee27174b6 --- /dev/null +++ b/pkgs/development/libraries/libepoxy/libgl-path.patch @@ -0,0 +1,24 @@ +diff --git a/src/dispatch_common.c b/src/dispatch_common.c +index b3e4f5f..303e8f5 100644 +--- a/src/dispatch_common.c ++++ b/src/dispatch_common.c +@@ -310,6 +310,19 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail, bool l + flags |= RTLD_NOLOAD; + + *handle = dlopen(lib_name, flags); ++#ifdef LIBGL_PATH ++ if (!*handle) { ++ char pathbuf[sizeof(LIBGL_PATH) + 1 + 1024 + 1]; ++ int l = snprintf(pathbuf, sizeof(pathbuf), "%s/%s", LIBGL_PATH, lib_name); ++ if (l < 0 || l >= sizeof(pathbuf)) { ++ // This really shouldn't happen ++ fprintf(stderr, "Error prefixing library pathname\n"); ++ exit(1); ++ } ++ *handle = dlopen(pathbuf, flags); ++ } ++#endif ++ + if (!*handle) { + if (exit_on_fail) { + fprintf(stderr, "Couldn't open %s: %s\n", lib_name, dlerror()); diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 099bac9274b26..5ce953be07011 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -9,7 +9,7 @@ , shaderc , glslang , lcms2 -, epoxy +, libepoxy , libGL , xorg }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { shaderc glslang lcms2 - epoxy + libepoxy libGL xorg.libX11 ]; diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix index e9c0e3c7f44f0..e68c60ebbdbf8 100644 --- a/pkgs/development/libraries/libwpe/fdo.nix +++ b/pkgs/development/libraries/libwpe/fdo.nix @@ -5,7 +5,7 @@ , pkg-config , ninja , wayland -, epoxy +, libepoxy , glib , libwpe , libxkbcommon @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland - epoxy + libepoxy glib libwpe libxkbcommon diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 9c03a9f6c4913..de69bd730d25f 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -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 { pname = "movit"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { GTEST_DIR = "${gtest.src}/googletest"; - propagatedBuildInputs = [ eigen epoxy ]; + propagatedBuildInputs = [ eigen libepoxy ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL2 fftw gtest ]; diff --git a/pkgs/development/libraries/retro-gtk/default.nix b/pkgs/development/libraries/retro-gtk/default.nix index 3ab3ffcda0d3c..e1385f7a3ef02 100644 --- a/pkgs/development/libraries/retro-gtk/default.nix +++ b/pkgs/development/libraries/retro-gtk/default.nix @@ -5,7 +5,7 @@ , meson , ninja , pkg-config -, epoxy +, libepoxy , glib , gtk3 , libpulseaudio @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - epoxy + libepoxy glib gtk3 libpulseaudio diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 3d76e67f67ad1..13bfae944e02e 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -3,7 +3,7 @@ , acl , cyrus_sasl , docbook_xsl -, epoxy +, libepoxy , gettext , gobject-introspection , gst_all_1 @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { buildInputs = [ cyrus_sasl - epoxy + libepoxy gtk3 json-glib libcacard diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 4c4af6b2c1f8c..1fbf94452f769 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake, meson, ninja, pkg-config, python3 -, libGLU, epoxy, libX11, libdrm, mesa +, libGLU, libepoxy, libX11, libdrm, mesa }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1h76a1ylhh4niq33sa5knx033sr4k2816vibh4m58j54y7qc6346"; }; - buildInputs = [ libGLU epoxy libX11 libdrm mesa ]; + buildInputs = [ libGLU libepoxy libX11 libdrm mesa ]; nativeBuildInputs = [ cmake meson ninja pkg-config python3 ]; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 304dfbc2e7849..d3b0ef67d86ef 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -21,7 +21,7 @@ , enchant2 , xorg , libxkbcommon -, epoxy +, libepoxy , at-spi2-core , libxml2 , libsoup @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { buildInputs = [ at-spi2-core enchant2 - epoxy + libepoxy gnutls gst-plugins-bad gst-plugins-base diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 945ebf7b785e1..edeacdec2a1cf 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, zlib, boost -, openal, glm, freetype, libGLU, SDL2, epoxy +, openal, glm, freetype, libGLU, SDL2, libepoxy , dejavu_fonts, inkscape, optipng, imagemagick , withCrashReporter ? !stdenv.isDarwin , qtbase ? null @@ -27,7 +27,7 @@ stdenv.mkDerivation { buildInputs = [ zlib boost openal glm - freetype libGLU SDL2 epoxy + freetype libGLU SDL2 libepoxy ] ++ optionals withCrashReporter [ qtbase curl ] ++ optionals stdenv.isLinux [ gdb ]; diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix index 8e2fa41f4200e..c78bc69c26fd9 100644 --- a/pkgs/games/gnome-hexgl/default.nix +++ b/pkgs/games/gnome-hexgl/default.nix @@ -5,7 +5,7 @@ , pkg-config , gthree , gsound -, epoxy +, libepoxy , gtk3 }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ gthree gsound - epoxy + libepoxy gtk3 ]; diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index dce771faec17b..c4af373cdcddb 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext , glibmm, libxmlxx, pango, librsvg -, SDL2, glew, boost, ffmpeg, portaudio, epoxy +, SDL2, glew, boost, ffmpeg, portaudio, libepoxy }: stdenv.mkDerivation rec { @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { buildInputs = [ glibmm libxmlxx pango librsvg - SDL2 glew boost ffmpeg portaudio epoxy + SDL2 glew boost ffmpeg portaudio libepoxy ]; } diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/misc/emulators/melonDS/default.nix index 7123f496fad6f..3e30be8c2a3ff 100644 --- a/pkgs/misc/emulators/melonDS/default.nix +++ b/pkgs/misc/emulators/melonDS/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , mkDerivation , cmake -, epoxy +, libepoxy , libarchive , libpcap , libslirp @@ -24,7 +24,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - epoxy + libepoxy libarchive libslirp qtbase diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index c15c8a0ad76a9..48ec288c40507 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , SDL2 , cmake -, epoxy +, libepoxy , ffmpeg , imagemagick , libedit @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ SDL2 - epoxy + libepoxy ffmpeg imagemagick libedit diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index e19b97a477ef4..fa55c2e9635df 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsa-lib, gtk3 , makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils -, epoxy, gdk-pixbuf, gnome, wrapGAppsHook +, libepoxy, gdk-pixbuf, gnome, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 alsa-lib - epoxy + libepoxy gtk3 gdk-pixbuf libGLU libGL diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 8cebc664bca2f..27f3400cc0b1c 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,5 +1,5 @@ { 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 { pname = "snes9x-gtk"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; 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"; diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index 13dd8302b18d2..736f5ca6bc9de 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, elfutils , xorg, patchelf, openssl, libdrm, udev -, libxcb, libxshmfence, epoxy, perl, zlib +, libxcb, libxshmfence, libepoxy, perl, zlib , ncurses , libsOnly ? false, kernel ? null }: @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { depLibPath = makeLibraryPath [ 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 = '' diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 3a6ec31ad750f..87a42c4b85266 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -4,7 +4,7 @@ freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, 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 }: @@ -650,7 +650,7 @@ self: super: ./dont-create-logdir-during-build.patch ]; 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 ]; prePatch = lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 7db47f4bf7643..98f2f3c973004 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,5 +1,5 @@ { egl-wayland -, epoxy +, libepoxy , fetchurl , fontutil , lib @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ egl-wayland - epoxy + libepoxy fontutil libGL libGLU diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 710ed04006c4e..9af99a58098b2 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config , gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp -, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu +, libxkbcommon, libepoxy, at-spi2-core, dbus, libdbusmenu , wrapGAppsHook }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; buildInputs = [ gtk glib pcre libappindicator libpthreadstubs - libXdmcp libxkbcommon epoxy at-spi2-core + libXdmcp libxkbcommon libepoxy at-spi2-core dbus libdbusmenu ]; diff --git a/pkgs/tools/graphics/wdisplays/default.nix b/pkgs/tools/graphics/wdisplays/default.nix index 073a3b1b6d476..49832c5d6d863 100644 --- a/pkgs/tools/graphics/wdisplays/default.nix +++ b/pkgs/tools/graphics/wdisplays/default.nix @@ -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 { pname = "wdisplays"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; - buildInputs = [ gtk3 epoxy wayland ]; + buildInputs = [ gtk3 libepoxy wayland ]; src = fetchFromGitHub { owner = "luispabon"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 7b27184cde325..723624e96abcc 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -17,7 +17,7 @@ , libdatrie , libXdmcp , libxkbcommon -, epoxy +, libepoxy , dbus , at-spi2-core , libXtst @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { libdatrie libXdmcp libxkbcommon - epoxy + libepoxy dbus at-spi2-core libXtst diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 48d1c21445fd2..8af257e34d467 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -224,6 +224,7 @@ mapAliases ({ emacsPackages = emacs.pkgs; # added 2020-12-18 enblendenfuse = enblend-enfuse; # 2015-09-30 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 evolution_data_server = evolution-data-server; # added 2018-02-25 etcdctl = etcd; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86ec2fbc457d3..b945bbfe88f04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16009,7 +16009,7 @@ with pkgs; entt = callPackage ../development/libraries/entt { }; - epoxy = callPackage ../development/libraries/epoxy {}; + libepoxy = callPackage ../development/libraries/libepoxy {}; libesmtp = callPackage ../development/libraries/libesmtp { }; -- cgit 1.4.1 From e5464a636e47a9c580d5b62f5d33a25a66ae9e56 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 11 Nov 2021 05:43:50 +0100 Subject: libepoxy: add erictapen as maintainer --- pkgs/development/libraries/libepoxy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index d0612e1160e2c..83b8ba8960d59 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "A library for handling OpenGL function pointer management"; homepage = "https://github.com/anholt/libepoxy"; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu erictapen ]; platforms = platforms.unix; }; } -- cgit 1.4.1