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/servers/x11 | |
| 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/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/xwayland.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 3a6ec31ad75..87a42c4b852 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 7db47f4bf76..98f2f3c9730 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 |