diff options
author | Kerstin Humm <kerstin@erictapen.name> | 2021-11-11 05:35:34 +0100 |
---|---|---|
committer | Kerstin Humm <kerstin@erictapen.name> | 2021-11-11 05:55:32 +0100 |
commit | bb799694db5480bf2d0c56d27ede14dc491ad377 (patch) | |
tree | 110b698492c658b3e9122bc280a62759b4f2b963 /pkgs/development | |
parent | 62b9b0d9e860b2223bb0d4a1fa1d06045197fe2d (diff) | |
download | nixpkgs-bb799694db5480bf2d0c56d27ede14dc491ad377.tar nixpkgs-bb799694db5480bf2d0c56d27ede14dc491ad377.tar.gz nixpkgs-bb799694db5480bf2d0c56d27ede14dc491ad377.tar.bz2 nixpkgs-bb799694db5480bf2d0c56d27ede14dc491ad377.tar.lz nixpkgs-bb799694db5480bf2d0c56d27ede14dc491ad377.tar.xz nixpkgs-bb799694db5480bf2d0c56d27ede14dc491ad377.tar.zst nixpkgs-bb799694db5480bf2d0c56d27ede14dc491ad377.zip |
epoxy: rename to libepoxy
https://github.com/NixOS/nixpkgs/issues/145040
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/gthree/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/gtk/3.x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/gtk/4.x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/gtkmm/3.x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/gtkmm/4.x.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kdeclarative.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libepoxy/default.nix (renamed from pkgs/development/libraries/epoxy/default.nix) | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libepoxy/libgl-path.patch (renamed from pkgs/development/libraries/epoxy/libgl-path.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/libplacebo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libwpe/fdo.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/movit/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/retro-gtk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/spice-gtk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/virglrenderer/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/webkitgtk/default.nix | 4 |
15 files changed, 28 insertions, 28 deletions
diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix index 990e151efe4..a59541edb25 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 6fce8ca78e8..82bcad0b985 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 78d9174d095..363d9b80a7f 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 734cf833fd8..2d0921cf097 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 67afc4026d1..c1bac87a6c0 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 cc4e2699821..1389df5eb15 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/epoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index 7ae0e73953f..d0612e1160e 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -5,12 +5,12 @@ with lib; stdenv.mkDerivation rec { - pname = "epoxy"; + pname = "libepoxy"; version = "1.5.4"; src = fetchFromGitHub { owner = "anholt"; - repo = "libepoxy"; + repo = pname; rev = version; sha256 = "0rmg0qlswn250h0arx434jh3hwzsr95lawanpmh1czsfvrcx59l6"; }; diff --git a/pkgs/development/libraries/epoxy/libgl-path.patch b/pkgs/development/libraries/libepoxy/libgl-path.patch index 8f38ee27174..8f38ee27174 100644 --- a/pkgs/development/libraries/epoxy/libgl-path.patch +++ b/pkgs/development/libraries/libepoxy/libgl-path.patch diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index 099bac9274b..5ce953be070 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 e9c0e3c7f44..e68c60ebbdb 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 9c03a9f6c49..de69bd730d2 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 3ab3ffcda0d..e1385f7a3ef 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 3d76e67f67a..13bfae944e0 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 4c4af6b2c1f..1fbf94452f7 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 304dfbc2e78..d3b0ef67d86 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 |