various: rename references and deprecate alias (#486994)

This commit is contained in:
Jo
2026-02-05 20:31:22 +00:00
committed by GitHub
240 changed files with 868 additions and 869 deletions
@@ -13,7 +13,7 @@
qtdeclarative,
qtquickcontrols2 ? null,
systemd,
xkeyboardconfig,
xkeyboard-config,
nixosTests,
docutils,
}:
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace src/greeter/waylandkeyboardbackend.cpp \
--replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"
--replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboard-config}/share/X11/xkb/rules/evdev.xml"
'';
nativeBuildInputs = [
@@ -38,11 +38,11 @@
libxcb,
libxkbcommon,
mesa-demos,
xcbutilwm,
xcbutilrenderutil,
xcbutilkeysyms,
xcbutilimage,
xcbutilcursor,
libxcb-wm,
libxcb-render-util,
libxcb-keysyms,
libxcb-image,
libxcb-cursor,
libxkbfile,
libXcomposite,
libXcursor,
@@ -171,11 +171,11 @@ let
libX11
libxcb
libxkbcommon
xcbutilwm
xcbutilrenderutil
xcbutilkeysyms
xcbutilimage
xcbutilcursor
libxcb-wm
libxcb-render-util
libxcb-keysyms
libxcb-image
libxcb-cursor
libice
libsm
libxkbfile
@@ -10,8 +10,8 @@
libxcrypt,
lttng-ust_2_12,
musl,
libICE,
libSM,
libice,
libsm,
libX11,
dotnetCorePackages,
libxcb-keysyms,
@@ -73,8 +73,8 @@ in
];
extraLdPath = lib.optionals (stdenv.hostPlatform.isLinux) [
# Avalonia dependencies needed for dotMemory
libICE
libSM
libice
libsm
libX11
];
+4 -4
View File
@@ -18,14 +18,14 @@
ruby,
libX11,
libXext,
libSM,
libsm,
libXpm,
libXt,
libXaw,
libXau,
libXmu,
libsodium,
libICE,
libice,
wayland-scanner,
vimPlugins,
makeWrapper,
@@ -177,8 +177,8 @@ stdenv.mkDerivation {
]
# All X related dependencies
++ lib.optionals (guiSupport == "gtk2" || guiSupport == "gtk3") [
libSM
libICE
libsm
libice
libX11
libXext
libXpm
@@ -9,7 +9,7 @@
glib,
gtk2,
alsa-lib,
libSM,
libsm,
libX11,
gdk-pixbuf,
pango,
@@ -26,7 +26,7 @@ let
glib
gtk2
alsa-lib
libSM
libsm
libX11
gdk-pixbuf
pango
@@ -16,7 +16,7 @@
wrapGAppsHook3,
makeWrapper,
pixman,
libpthreadstubs,
libpthread-stubs,
gtkmm3,
libXau,
libXdmcp,
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
libepoxy
libXtst
pixman
libpthreadstubs
libpthread-stubs
gtkmm3
libXau
libXdmcp
@@ -9,14 +9,14 @@
qtquickcontrols2,
libXinerama,
libxcb,
libSM,
libsm,
libXi,
libglvnd,
libXext,
libXrandr,
mailspring,
libX11,
libICE,
libice,
libXrender,
autoPatchelfHook,
makeWrapper,
@@ -54,14 +54,14 @@ let
qtquickcontrols2
libXinerama
libxcb
libSM
libsm
libXi
libglvnd
libXext
libXrandr
mailspring
libX11
libICE
libice
libXrender
];
@@ -111,14 +111,14 @@ buildFHSEnv {
qtquickcontrols2
libXinerama
libxcb
libSM
libsm
libXi
libglvnd
libXext
libXrandr
mailspring
libX11
libICE
libice
libXrender
openal
];
@@ -5,8 +5,8 @@
buildDotnetModule,
dotnetCorePackages,
libX11,
libICE,
libSM,
libice,
libsm,
libXi,
libXcursor,
libXext,
@@ -60,8 +60,8 @@ buildDotnetModule rec {
runtimeDeps = [
# Avalonia UI
libX11
libICE
libSM
libice
libsm
libXi
libXcursor
libXext
@@ -6,7 +6,7 @@
glib,
libGL,
libGLU,
libSM,
libsm,
libXcomposite,
libXi,
@@ -27,7 +27,7 @@
cups,
alsa-lib,
xkeyboardconfig,
xkeyboard-config,
autoPatchelfHook,
wrapQtAppsHook,
}:
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
autoPatchelfHook
wrapQtAppsHook
];
propagatedBuildInputs = [ xkeyboardconfig ];
propagatedBuildInputs = [ xkeyboard-config ];
buildInputs = [
dbus
cups
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
gst_all_1.gstreamer
libGL
libGLU
libSM
libsm
libX11
libXcomposite
libXi
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
postFixup = ''
wrapProgram $out/bin/googleearth-pro \
--set QT_QPA_PLATFORM xcb \
--set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb"
--set QT_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb"
'';
meta = {
+2 -2
View File
@@ -8,7 +8,7 @@
gtk3,
libgee,
poppler,
libpthreadstubs,
libpthread-stubs,
gstreamer,
gst-plugins-base,
gst-plugins-good,
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
[ librsvg ]
else
[
libpthreadstubs
libpthread-stubs
webkitgtk_4_1
];
in
+2 -2
View File
@@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
cmake,
libpthreadstubs,
libpthread-stubs,
icu,
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [
libpthreadstubs
libpthread-stubs
icu
];
@@ -16,8 +16,8 @@
gtkspell2,
intltool,
lib,
libICE,
libSM,
libice,
libsm,
libXScrnSaver,
libXext,
libgcrypt,
@@ -74,8 +74,8 @@ let
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
gst_all_1.gstreamer
libICE
libSM
libice
libsm
libXScrnSaver
libXext
libgnt
@@ -13,7 +13,7 @@
libXext,
libXdamage,
libXtst,
libSM,
libsm,
libXfixes,
coreutils,
wrapQtAppsHook,
@@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
libXext
libXdamage
libXtst
libSM
libsm
libXfixes
dbus
icu63
@@ -13,7 +13,7 @@
gmp,
libGL,
libGLU,
libSM,
libsm,
mpfr,
proj,
python3,
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
gmp
libGL
libGLU
libSM
libsm
mpfr
proj
python
@@ -24,10 +24,10 @@
qttools,
qtwebengine,
qtwebview,
xcbutilimage,
xcbutilkeysyms,
xcbutilrenderutil,
xcbutilwm,
libxcb-image,
libxcb-keysyms,
libxcb-render-util,
libxcb-wm,
}:
{
@@ -66,10 +66,10 @@ let
qttools
qtwebengine
qtwebview
xcbutilimage
xcbutilkeysyms
xcbutilrenderutil
xcbutilwm
libxcb-image
libxcb-keysyms
libxcb-render-util
libxcb-wm
];
dontBuild = true;
+2 -2
View File
@@ -81,7 +81,7 @@
harfbuzz,
lcms2,
libidn2,
libpthreadstubs,
libpthread-stubs,
libtasn1,
libplist,
p11-kit,
@@ -335,7 +335,7 @@ stdenv.mkDerivation (
glib
harfbuzz
lcms2
libpthreadstubs
libpthread-stubs
ffmpeg
flatbuffers
fstrcmp
@@ -17,7 +17,7 @@
jansson,
libjack2,
libxkbcommon,
libpthreadstubs,
libpthread-stubs,
libXdmcp,
qtbase,
qtsvg,
@@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
libjack2
libv4l
libxkbcommon
libpthreadstubs
libpthread-stubs
libXdmcp
qtbase
qtsvg
@@ -4,8 +4,8 @@
vdr,
alsa-lib,
fetchFromGitHub,
xcbutilwm,
xorgserver,
libxcb-wm,
xorg-server,
ffmpeg,
libva,
libvdpau,
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [
vdr
xcbutilwm
libxcb-wm
ffmpeg
alsa-lib
libva
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace softhddev.c \
--replace "LOCALBASE \"/bin/X\"" "\"${xorgserver}/bin/X\""
--replace "LOCALBASE \"/bin/X\"" "\"${xorg-server}/bin/X\""
'';
meta = {
@@ -4,10 +4,10 @@
fetchFromGitHub,
patches,
libxcb,
xcbutilkeysyms,
xcbutilwm,
libxcb-keysyms,
libxcb-wm,
libX11,
xcbutil,
libxcb-util,
xcbutilxrm,
}:
@@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
buildInputs = [
libxcb
xcbutilkeysyms
xcbutilwm
libxcb-keysyms
libxcb-wm
libX11
xcbutil
libxcb-util
xcbutilxrm
];
@@ -21,8 +21,8 @@
libxcb,
libstartup_notification,
libxdg_basedir,
libpthreadstubs,
xcb-util-cursor,
libpthread-stubs,
libxcb-cursor,
makeWrapper,
pango,
gobject-introspection,
@@ -123,13 +123,13 @@ stdenv.mkDerivation rec {
dbus
gdk-pixbuf
luaEnv
libpthreadstubs
libpthread-stubs
libstartup_notification
libxdg_basedir
lua
net-tools
pango
xcb-util-cursor
libxcb-cursor
libxau
libxdmcp
libxcb
@@ -13,10 +13,10 @@
makeWrapper,
pcre2,
pkg-config,
xcbutilcursor,
xcbutilkeysyms,
xcbutilwm,
xcbutil,
libxcb-cursor,
libxcb-keysyms,
libxcb-wm,
libxcb-util,
xmodmap,
}:
@@ -50,10 +50,10 @@ stdenv.mkDerivation (finalAttrs: {
libXdmcp
libxcb
pcre2
xcbutilcursor
xcbutilkeysyms
xcbutilwm
xcbutil
libxcb-cursor
libxcb-keysyms
libxcb-wm
libxcb-util
];
# src/ewmh/ewmh.cpp:67:28: error: non-constant-expression cannot be narrowed from type 'int' to 'uint32_t' (aka 'unsigned int') in initializer list
@@ -8,21 +8,21 @@
ninja,
installShellFiles,
libxcb,
xcbutilkeysyms,
xcbutil,
xcbutilwm,
libxcb-keysyms,
libxcb-util,
libxcb-wm,
xcbutilxrm,
libstartup_notification,
libX11,
pcre2,
libev,
yajl,
xcb-util-cursor,
libxcb-cursor,
perl,
pango,
perlPackages,
libxkbcommon,
xorgserver,
xorg-server,
xvfb-run,
xdotool,
xrandr,
@@ -69,9 +69,9 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libxcb
xcbutilkeysyms
xcbutil
xcbutilwm
libxcb-keysyms
libxcb-util
libxcb-wm
xcbutilxrm
libxkbcommon
libstartup_notification
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
pcre2
libev
yajl
xcb-util-cursor
libxcb-cursor
perl
pango
perlPackages.AnyEventI3
@@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = stdenv.hostPlatform.isLinux;
nativeCheckInputs = lib.optionals finalAttrs.finalPackage.doCheck [
xorgserver
xorg-server
xvfb-run
xdotool
setxkbmap
@@ -5,7 +5,7 @@
pkg-config,
xorgproto,
libxcb,
xcbutilkeysyms,
libxcb-keysyms,
libx11,
i3ipc-glib,
glib,
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libxcb
xcbutilkeysyms
libxcb-keysyms
xorgproto
libx11.dev
i3ipc-glib
@@ -5,8 +5,8 @@
autoreconfHook,
pkg-config,
libxcb,
xcbutilkeysyms,
xcbutilimage,
libxcb-keysyms,
libxcb-image,
pam,
libX11,
libev,
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
libxcb
xcbutilkeysyms
xcbutilimage
libxcb-keysyms
libxcb-image
pam
libX11
libev
@@ -6,8 +6,8 @@
ninja,
pkg-config,
libxcb,
xcbutilkeysyms,
xcbutilimage,
libxcb-keysyms,
libxcb-image,
xcbutilxrm,
pam,
libX11,
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
];
buildInputs = [
libxcb
xcbutilkeysyms
xcbutilimage
libxcb-keysyms
libxcb-image
xcbutilxrm
pam
libX11
@@ -5,8 +5,8 @@
lua,
gettext,
groff,
libICE,
libSM,
libice,
libsm,
libX11,
libXext,
}:
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [
libICE
libSM
libice
libsm
libX11
libXext
lua
@@ -14,7 +14,7 @@
libinput,
libxkbcommon,
vulkan-headers,
xcbutilwm,
libxcb-wm,
gtkmm3,
withFiltersPlugin ? true,
withFocusRequestPlugin ? true,
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
libinput
libxkbcommon
vulkan-headers
xcbutilwm
libxcb-wm
gtkmm3
];
@@ -3,8 +3,8 @@
dotnetCorePackages,
fontconfig,
lib,
libICE,
libSM,
libice,
libsm,
libX11,
stdenv,
writeText,
@@ -56,8 +56,8 @@
lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
setupHook = writeText "setupHook.sh" ''
prependToVar dotnetRuntimeDeps \
"${lib.getLib libICE}" \
"${lib.getLib libSM}" \
"${lib.getLib libice}" \
"${lib.getLib libsm}" \
"${lib.getLib libX11}"
'';
}
+4 -4
View File
@@ -6,8 +6,8 @@
dbus,
fltk_1_3,
gtk2,
libICE,
libSM,
libice,
libsm,
libtiff,
pkg-config,
}:
@@ -60,8 +60,8 @@ stdenv.mkDerivation (finalAttrs: {
dbus
fltk_1_3
gtk2
libICE
libSM
libice
libsm
libtiff
];
+2 -2
View File
@@ -21,7 +21,7 @@
libgbm,
openssl,
systemd,
xcb-util-cursor,
libxcb-cursor,
libxcb-wm,
libxcb-render-util,
libxcb-keysyms,
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
openssl
stdenv.cc.cc
systemd
xcb-util-cursor
libxcb-cursor
libx11
libxcb-wm
libxcb-image
+2 -2
View File
@@ -51,7 +51,7 @@
libshout,
ffmpeg_6,
libmpeg2,
xcbutilkeysyms,
libxcb-keysyms,
lirc,
lua5_2,
taglib,
@@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: {
srt
libshout
ffmpeg_6
xcbutilkeysyms
libxcb-keysyms
lirc
lua5_2
taglib
+4 -4
View File
@@ -43,8 +43,8 @@
wayland,
wayland-protocols,
wayland-scanner,
xcbutil,
xcbutilwm,
libxcb-util,
libxcb-wm,
xz,
# Boolean flags
buildManPages ? true,
@@ -105,8 +105,8 @@ stdenv.mkDerivation (finalAttrs: {
valgrind
wayland
wayland-protocols
xcbutil
xcbutilwm
libxcb-util
libxcb-wm
xz
]
++ lib.optionals (!useBuiltinLua) [ luajit ]
+2 -2
View File
@@ -15,7 +15,7 @@
libXtst,
wrapGAppsHook3,
pixman,
libpthreadstubs,
libpthread-stubs,
gtkmm3,
libXau,
libXdmcp,
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
libepoxy
libXtst
pixman
libpthreadstubs
libpthread-stubs
gtkmm3
libXau
libXdmcp
+2 -2
View File
@@ -5,7 +5,7 @@
cairomm,
cmake,
libjack2,
libpthreadstubs,
libpthread-stubs,
libXdmcp,
libxshmfence,
libsndfile,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
cairomm
libjack2
libpthreadstubs
libpthread-stubs
libXdmcp
libxshmfence
libsndfile
+4 -4
View File
@@ -5,8 +5,8 @@
alsa-lib,
fetchurl,
gcc-unwrapped,
libICE,
libSM,
libice,
libsm,
libX11,
libXext,
}:
@@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
SDL
alsa-lib
gcc-unwrapped
libICE
libSM
libice
libsm
libX11
libXext
];
+2 -2
View File
@@ -42,7 +42,7 @@
libepoxy,
libXdmcp,
libXtst,
libpthreadstubs,
libpthread-stubs,
libsbsms_2_3_0,
libselinux,
libsepol,
@@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
libepoxy
libXdmcp
libXtst
libpthreadstubs
libpthread-stubs
libxkbcommon
libselinux
libsepol
+4 -4
View File
@@ -5,8 +5,8 @@
fetchzip,
fontconfig,
lib,
libICE,
libSM,
libice,
libsm,
libX11,
libXcursor,
libXext,
@@ -81,9 +81,9 @@ stdenvNoCC.mkDerivation (
patchShebangs build.sh
substituteInPlace src/Avalonia.X11/ICELib.cs \
--replace-fail '"libICE.so.6"' '"${lib.getLib libICE}/lib/libICE.so.6"'
--replace-fail '"libICE.so.6"' '"${lib.getLib libice}/lib/libICE.so.6"'
substituteInPlace src/Avalonia.X11/SMLib.cs \
--replace-fail '"libSM.so.6"' '"${lib.getLib libSM}/lib/libSM.so.6"'
--replace-fail '"libSM.so.6"' '"${lib.getLib libsm}/lib/libSM.so.6"'
substituteInPlace src/Avalonia.X11/XLib.cs \
--replace-fail '"libX11.so.6"' '"${lib.getLib libX11}/lib/libX11.so.6"' \
--replace-fail '"libXrandr.so.2"' '"${lib.getLib libXrandr}/lib/libXrandr.so.2"' \
+2 -2
View File
@@ -15,7 +15,7 @@
gobject-introspection,
gtk-doc,
docbook_xsl,
xorgserver,
xorg-server,
dbus,
python3,
wrapGAppsHook3,
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
vala
which
wrapGAppsHook3
xorgserver
xorg-server
];
buildInputs = [
+6 -6
View File
@@ -22,10 +22,10 @@
libGL,
libxcb,
vst2-sdk,
xcbutil,
libxcb-util,
libxkbcommon,
xcbutilkeysyms,
xcb-util-cursor,
libxcb-keysyms,
libxcb-cursor,
gtk3,
webkitgtk_4_1,
python3,
@@ -112,10 +112,10 @@ stdenv.mkDerivation (finalAttrs: {
zenity
alsa-tools
libxcb
xcbutil
libxcb-util
libxkbcommon
xcbutilkeysyms
xcb-util-cursor
libxcb-keysyms
libxcb-cursor
mount
];
+8 -8
View File
@@ -12,10 +12,10 @@
stdenv,
unzip,
wayland,
xcbutilimage,
xcbutilkeysyms,
xcbutilrenderutil,
xcbutilwm,
libxcb-image,
libxcb-keysyms,
libxcb-render-util,
libxcb-wm,
libxml2,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -61,10 +61,10 @@ stdenv.mkDerivation (finalAttrs: {
libxkbcommon
stdenv.cc.cc.lib
wayland
xcbutilimage
xcbutilkeysyms
xcbutilrenderutil
xcbutilwm
libxcb-image
libxcb-keysyms
libxcb-render-util
libxcb-wm
];
installPhase = ''
+2 -2
View File
@@ -15,7 +15,7 @@
libjpeg,
libtool,
wxGTK32,
xcbutil,
libxcb-util,
sqlite,
gtk3,
patchelf,
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
libnotify
libX11
libxcb
xcbutil
libxcb-util
];
NIX_LDFLAGS = lib.optionalString (!headless) "-lX11";
+6 -6
View File
@@ -4,9 +4,9 @@
fetchFromGitHub,
libxcb,
libXinerama,
xcbutil,
xcbutilkeysyms,
xcbutilwm,
libxcb-util,
libxcb-keysyms,
libxcb-wm,
nixosTests,
}:
@@ -24,9 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libxcb
libXinerama
xcbutil
xcbutilkeysyms
xcbutilwm
libxcb-util
libxcb-keysyms
libxcb-wm
];
makeFlags = [ "PREFIX=$(out)" ];
+2 -2
View File
@@ -14,7 +14,7 @@
gnome-settings-daemon,
dbus,
json-glib,
libICE,
libice,
xmlto,
docbook_xsl,
docbook_xml_dtd_412,
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
glib
gtk3
libICE
libice
gnome-desktop
json-glib
xtrans
+4 -4
View File
@@ -27,9 +27,9 @@
glib,
libbsd,
libX11,
xorgserver,
xorg-server,
kmod,
xf86videonouveau,
xf86-video-nouveau,
nvidia_x11 ? linuxPackages.nvidia_x11,
linuxPackages,
pkgsi686Linux,
@@ -65,12 +65,12 @@ let
bbdPath = lib.makeBinPath [
kmod
xorgserver
xorg-server
];
xmodules = lib.concatStringsSep "," (
map (x: "${x.out or x}/lib/xorg/modules") (
[ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau
[ xorg-server ] ++ lib.optional (!useNvidia) xf86-video-nouveau
)
);
+2 -2
View File
@@ -9,7 +9,7 @@
libX11,
pkg-config,
upx,
xcbutil,
libxcb-util,
}:
stdenv.mkDerivation {
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
libGL
libGLU
libX11
xcbutil
libxcb-util
];
nativeBuildInputs = [
+2 -2
View File
@@ -14,7 +14,7 @@
wayland-protocols,
pixman,
libxkbcommon,
xcbutilwm,
libxcb-wm,
libGL,
libX11,
xwayland ? null,
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
wayland-protocols
pixman
libxkbcommon
xcbutilwm
libxcb-wm
libGL
libX11
];
+2 -2
View File
@@ -8,7 +8,7 @@
libevdev,
libinput,
libxkbcommon,
xcbutilwm,
libxcb-wm,
makeWrapper,
meson,
ninja,
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
libevdev
libinput
libxkbcommon
xcbutilwm
libxcb-wm
pango
pixman
systemd
+6 -6
View File
@@ -6,9 +6,9 @@
pkg-config,
cairo,
libxkbcommon,
xcbutilcursor,
xcbutilkeysyms,
xcbutil,
libxcb-cursor,
libxcb-keysyms,
libxcb-util,
libXrandr,
libXinerama,
libXcursor,
@@ -37,9 +37,9 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
cairo
libxkbcommon
xcbutilcursor
xcbutilkeysyms
xcbutil
libxcb-cursor
libxcb-keysyms
libxcb-util
libXrandr
libXinerama
libXcursor
+2 -2
View File
@@ -14,7 +14,7 @@
libmodule,
libXdmcp,
util-linux,
libpthreadstubs,
libpthread-stubs,
enableDdc ? true,
ddcutil,
enableDpms ? true,
@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
libXdmcp
util-linux
libpthreadstubs
libpthread-stubs
]
++ lib.optionals enableDdc [ ddcutil ]
++ lib.optionals enableDpms [ libXext ]
+8 -8
View File
@@ -2,10 +2,10 @@
lib,
stdenv,
fetchFromBitbucket,
xcbutil,
xcbutilkeysyms,
xcbutilwm,
xcb-util-cursor,
libxcb-util,
libxcb-keysyms,
libxcb-wm,
libxcb-cursor,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -20,10 +20,10 @@ stdenv.mkDerivation (finalAttrs: {
};
buildInputs = [
xcbutil
xcbutilkeysyms
xcbutilwm
xcb-util-cursor
libxcb-util
libxcb-keysyms
libxcb-wm
libxcb-cursor
];
postPatch = ''
@@ -16,14 +16,14 @@
gettext,
libGL,
libGLU,
libSM,
libsm,
libXdmcp,
libXext,
libXinerama,
libXrandr,
libXxf86vm,
libao,
libpthreadstubs,
libpthread-stubs,
libpulseaudio,
libusb1,
mbedtls,
@@ -86,14 +86,14 @@ stdenv.mkDerivation (finalAttrs: {
gettext
libGL
libGLU
libSM
libsm
libXdmcp
libXext
libXinerama
libXrandr
libXxf86vm
libao
libpthreadstubs
libpthread-stubs
libpulseaudio
libusb1
mbedtls
+2 -2
View File
@@ -13,7 +13,7 @@
expat,
glew,
freetype,
libSM,
libsm,
libXext,
libGL,
libGLU,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
expat
glew
freetype
libSM
libsm
libXext
libGL
libGLU
+2 -2
View File
@@ -10,7 +10,7 @@
libXext,
libX11,
libpng,
libpthreadstubs,
libpthread-stubs,
libsmf,
libsndfile,
lv2,
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
libXext
libX11
libpng
libpthreadstubs
libpthread-stubs
libsmf
libsndfile
lv2
+4 -4
View File
@@ -8,13 +8,13 @@
alsa-lib,
libX11,
libsndfile,
libSM,
libsm,
libsamplerate,
libtool,
autoconf,
automake,
xorgproto,
libICE,
libice,
pkg-config,
}:
@@ -43,11 +43,11 @@ stdenv.mkDerivation rec {
alsa-lib
libX11
libsndfile
libSM
libsm
libsamplerate
libtool
xorgproto
libICE
libice
];
meta = {
+2 -2
View File
@@ -16,7 +16,7 @@
wayland-scanner,
wlroots_0_18,
writeText,
xcbutilwm,
libxcb-wm,
xwayland,
# Boolean flags
enableXWayland ? true,
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals enableXWayland [
libX11
xcbutilwm
libxcb-wm
xwayland
];
+2 -2
View File
@@ -5,7 +5,7 @@
pkg-config,
freetype,
imlib2,
libSM,
libsm,
libXcomposite,
libXdamage,
libXext,
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
freetype
imlib2
libSM
libsm
libXcomposite
libXdamage
libXext
+2 -2
View File
@@ -10,7 +10,7 @@
openimageio,
libjpeg,
libpng,
libpthreadstubs,
libpthread-stubs,
libX11,
glib,
}:
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
libjpeg
libpng
libX11
libpthreadstubs
libpthread-stubs
]
++ lib.optionals stdenv.hostPlatform.isDarwin [ glib ];
+4 -4
View File
@@ -14,8 +14,8 @@
libXmu,
libXext,
libXt,
libSM,
libICE,
libsm,
libice,
libpng,
pkg-config,
gettext,
@@ -48,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
libXmu
libXext
libXt
libSM
libICE
libsm
libice
libpng
gettext
];
+4 -4
View File
@@ -4,8 +4,8 @@
factorio-utils,
fetchurl,
libGL,
libICE,
libSM,
libice,
libsm,
libX11,
libXcursor,
libXext,
@@ -242,8 +242,8 @@ let
libPath = lib.makeLibraryPath [
alsa-lib
libGL
libICE
libSM
libice
libsm
libX11
libXcursor
libXext
+4 -4
View File
@@ -7,11 +7,11 @@
freealut,
libGLU,
libGL,
libICE,
libice,
libjpeg,
openal,
plib,
libSM,
libsm,
libunwind,
libX11,
xorgproto,
@@ -75,12 +75,12 @@ stdenv.mkDerivation rec {
freealut
libGLU
libGL
libICE
libice
libjpeg
openal
openscenegraph
plib
libSM
libsm
libunwind
libX11
xorgproto
+2 -2
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchurl,
libICE,
libice,
libXext,
libXi,
libXrandr,
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
buildInputs = [
libICE
libice
libXext
libXi
libXrandr
+2 -2
View File
@@ -13,7 +13,7 @@
alsa-lib,
libjack2,
libvorbis,
libSM,
libsm,
libsndfile,
libogg,
libX11,
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
libvorbis
libsndfile
libogg
libSM
libsm
libX11
nettle
];
+4 -4
View File
@@ -5,8 +5,8 @@
sbcl,
libX11,
libXpm,
libICE,
libSM,
libice,
libsm,
libXt,
libXau,
libXdmcp,
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
sbcl
libX11
libXpm
libICE
libSM
libice
libsm
libXt
libXau
libXdmcp
+2 -2
View File
@@ -7,7 +7,7 @@
fontconfig,
freetype,
fribidi,
libSM,
libsm,
libX11,
libXcursor,
libXft,
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
fontconfig
freetype
fribidi
libSM
libsm
libX11
libXcursor
libXft
+3 -3
View File
@@ -26,7 +26,7 @@
gobject-introspection,
plymouth,
coreutils,
xorgserver,
xorg-server,
dbus,
nixos-icons,
runCommand,
@@ -110,9 +110,9 @@ stdenv.mkDerivation (finalAttrs: {
inherit
coreutils
plymouth
xorgserver
dbus
;
xorgserver = xorg-server;
})
# The following patches implement certain environment variables in GDM which are set by
@@ -135,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
# Upstream checks some common paths to find an `X` binary. We already know it.
echo #!/bin/sh > build-aux/find-x-server.sh
echo "echo ${lib.getBin xorgserver}/bin/X" >> build-aux/find-x-server.sh
echo "echo ${lib.getBin xorg-server}/bin/X" >> build-aux/find-x-server.sh
patchShebangs build-aux/find-x-server.sh
# Reverts https://gitlab.gnome.org/GNOME/gdm/-/commit/b0f802e36ff948a415bfd2bccaa268b6990515b7
+2 -2
View File
@@ -18,7 +18,7 @@
libxext,
libx11,
pango,
xorgserver,
xorg-server,
testers,
validatePkgConfig,
}:
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
libxtst
pango
python3Packages.python
xorgserver
xorg-server
];
prePatch = ''
+2 -2
View File
@@ -11,7 +11,7 @@
libxcb,
lz4,
vulkan-loader,
xcbutilkeysyms,
libxcb-keysyms,
zlib,
zstd,
}:
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
lz4
python3
wayland
xcbutilkeysyms
libxcb-keysyms
zlib
zstd
];
+4 -4
View File
@@ -7,8 +7,8 @@
glib,
gtk2,
libX11,
libSM,
libICE,
libsm,
libice,
which,
copyDesktopItems,
makeDesktopItem,
@@ -36,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
glib
gtk2
libX11
libSM
libICE
libsm
libice
];
hardeningDisable = [ "format" ];
@@ -71,7 +71,7 @@
gnome-user-share,
gnome-remote-desktop,
wrapGAppsHook4,
xorgserver,
xorg-server,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
python3.pkgs.pygobject3 # for test-networkmanager-service.py
python3.pkgs.python-dbusmock
setxkbmap
xorgserver # for Xvfb
xorg-server # for Xvfb
];
doCheck = true;
+2 -2
View File
@@ -17,7 +17,7 @@
gnome-shell,
dbus,
json-glib,
libICE,
libice,
xmlto,
docbook_xsl,
docbook_xml_dtd_45,
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
glib
gtk4
libICE
libice
gnome-desktop
json-glib
xtrans
+4 -4
View File
@@ -6,8 +6,8 @@
SDL,
SDL_ttf,
SDL_image,
libSM,
libICE,
libsm,
libice,
libGLU,
libGL,
libpng,
@@ -46,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
SDL_image
lua5
libpng
libSM
libICE
libsm
libice
];
nativeBuildInputs = [
+2 -2
View File
@@ -7,7 +7,7 @@
gtk3,
glib,
libappindicator-gtk3,
libpthreadstubs,
libpthread-stubs,
libxdmcp,
libxkbcommon,
libepoxy,
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
gtk3
glib
libappindicator-gtk3
libpthreadstubs
libpthread-stubs
libxdmcp
libxkbcommon
libepoxy
+2 -2
View File
@@ -8,7 +8,7 @@
libXext,
sdbus-cpp,
udev,
xcbutilimage,
libxcb-image,
coreutils,
cli11,
ddcutil,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
sdbus-cpp
spdlog
udev
xcbutilimage
libxcb-image
];
cmakeFlags = [
+2 -2
View File
@@ -16,7 +16,7 @@
freetype,
asciidoc,
xdotool,
xorgserver,
xorg-server,
xsetroot,
xterm,
runtimeShell,
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
]
))
xdotool
xorgserver
xorg-server
xsetroot
xterm
python3.pkgs.pytestCheckHook
+4 -4
View File
@@ -6,8 +6,8 @@
makeWrapper,
libX11,
zlib,
libSM,
libICE,
libsm,
libice,
libXext,
freetype,
libXrender,
@@ -38,8 +38,8 @@ let
rpath = lib.makeLibraryPath [
libX11
zlib
libSM
libICE
libsm
libice
libXext
freetype
libXrender
+2 -2
View File
@@ -11,7 +11,7 @@
libX11,
gtk3,
pcre,
libpthreadstubs,
libpthread-stubs,
libXdmcp,
libxkbcommon,
libepoxy,
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
libX11
gtk3
pcre
libpthreadstubs
libpthread-stubs
libXdmcp
libxkbcommon
libepoxy
+4 -4
View File
@@ -6,10 +6,10 @@
libXmu,
libXi,
libX11,
libICE,
libice,
libGLU,
libGL,
libSM,
libsm,
libXext,
glibc,
lua,
@@ -25,10 +25,10 @@ let
libXi
libX11
libglut
libICE
libice
libGLU
libGL
libSM
libsm
libXext
glibc
lua
+6 -6
View File
@@ -14,8 +14,8 @@
giflib,
glib,
imlib2,
libICE,
libSM,
libice,
libsm,
libX11,
libXcomposite,
libXdamage,
@@ -29,7 +29,7 @@
libjpeg,
libogg,
libpng,
libpthreadstubs,
libpthread-stubs,
libsndfile,
libtiff,
libxcb,
@@ -71,8 +71,8 @@ gccStdenv.mkDerivation (finalAttrs: {
giflib
glib
imlib2
libICE
libSM
libice
libsm
libX11
libXcomposite
libXdamage
@@ -86,7 +86,7 @@ gccStdenv.mkDerivation (finalAttrs: {
libjpeg
libogg
libpng
libpthreadstubs
libpthread-stubs
libsndfile
libtiff
libxcb
+2 -2
View File
@@ -22,7 +22,7 @@
shared-mime-info,
stdenv,
writeShellApplication,
xkeyboardconfig,
xkeyboard-config,
}:
let
pname = "ideamaker";
@@ -86,7 +86,7 @@ stdenv.mkDerivation {
preFixup = ''
wrapProgram $out/bin/ideamaker \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \
--set QT_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb" \
--set QTCOMPOSE "${libX11.out}/share/X11/locale" \
--set KDEDIRS "$HOME/.nix-profile:/nix/var/nix/profiles/default" \
--set NIX_REDIRECTS /usr/share=$out/share/
+2 -2
View File
@@ -6,7 +6,7 @@
cairomm,
cmake,
lv2,
libpthreadstubs,
libpthread-stubs,
libXdmcp,
libXft,
ntk,
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
cairomm
lv2
libpthreadstubs
libpthread-stubs
libXdmcp
libXft
ntk
+4 -4
View File
@@ -4,8 +4,8 @@
fetchFromGitHub,
cmake,
curl,
libICE,
libSM,
libice,
libsm,
libX11,
libXdmcp,
libXext,
@@ -55,8 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
libXinerama
libXrandr
libXdmcp
libICE
libSM
libice
libsm
]
++ lib.optionals withLibei [
libei
+2 -2
View File
@@ -12,7 +12,7 @@
meson,
ninja,
pkg-config,
utilmacros,
util-macros,
# runtime
alsa-lib,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
meson
ninja
pkg-config
utilmacros
util-macros
];
buildInputs = [
+2 -2
View File
@@ -11,7 +11,7 @@
libX11,
libXau,
libXdmcp,
libpthreadstubs,
libpthread-stubs,
fetchpatch,
}:
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
libX11
libXau
libXdmcp
libpthreadstubs
libpthread-stubs
];
nativeCheckInputs = [ gtest ];
+2 -2
View File
@@ -29,7 +29,7 @@
openssl,
glfw,
pkg-config,
libpthreadstubs,
libpthread-stubs,
libXdmcp,
libmemcached,
}:
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
yajl
glfw
openssl
libpthreadstubs
libpthread-stubs
libXdmcp
libmemcached
python3
@@ -12,7 +12,7 @@
ladspa-sdk,
libxcb,
lv2,
xcbutilwm,
libxcb-wm,
libxcb-util,
zita-convolver,
zita-resampler,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
ladspa-sdk
libxcb
lv2
xcbutilwm
libxcb-wm
libxcb-util
zita-convolver
zita-resampler
+2 -2
View File
@@ -18,7 +18,7 @@
pkg-config,
doxygen,
graphviz,
libpthreadstubs,
libpthread-stubs,
libXdmcp,
unixODBC,
libgit2,
@@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: {
gettext
glew
glm
libpthreadstubs
libpthread-stubs
cairo
curl
openssl
+2 -2
View File
@@ -23,7 +23,7 @@
wayland-protocols,
wayland-scanner,
wlroots_0_19,
xcbutilwm,
libxcb-wm,
xwayland,
}:
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
wayland
wayland-protocols
wlroots_0_19
xcbutilwm
libxcb-wm
xwayland
];
+2 -2
View File
@@ -6,7 +6,7 @@
meson,
ninja,
docutils,
libpthreadstubs,
libpthread-stubs,
withIntel ? lib.meta.availableOn stdenv.hostPlatform libpciaccess,
libpciaccess,
withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !stdenv.cc.isClang,
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
docutils
];
buildInputs = [
libpthreadstubs
libpthread-stubs
]
++ lib.optional withIntel libpciaccess
++ lib.optional withValgrind valgrind-light;
+2 -2
View File
@@ -5,7 +5,7 @@
meson,
ninja,
pkg-config,
utilmacros,
util-macros,
python3,
libGL,
libX11,
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
meson
ninja
pkg-config
utilmacros
util-macros
python3
];
+2 -2
View File
@@ -3,7 +3,7 @@
stdenv,
fetchurl,
autoreconfHook,
libICE,
libice,
libjpeg,
libpng,
libX11,
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
];
propagatedBuildInputs = [
libICE
libice
libjpeg
libpng
libX11
+6 -6
View File
@@ -6,9 +6,9 @@
pkg-config,
cairo,
libxkbcommon,
xcbutilcursor,
xcbutilkeysyms,
xcbutil,
libxcb-cursor,
libxcb-keysyms,
libxcb-util,
libXrandr,
libXinerama,
libXcursor,
@@ -38,9 +38,9 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
cairo
libxkbcommon
xcbutilcursor
xcbutilkeysyms
xcbutil
libxcb-cursor
libxcb-keysyms
libxcb-util
libXrandr
libXinerama
libXcursor
+6 -6
View File
@@ -6,9 +6,9 @@
pkg-config,
cairo,
libxkbcommon,
xcbutilcursor,
xcbutilkeysyms,
xcbutil,
libxcb-cursor,
libxcb-keysyms,
libxcb-util,
libXrandr,
libXinerama,
libXcursor,
@@ -38,9 +38,9 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
cairo
libxkbcommon
xcbutilcursor
xcbutilkeysyms
xcbutil
libxcb-cursor
libxcb-keysyms
libxcb-util
libXrandr
libXinerama
libXcursor
@@ -5,7 +5,7 @@
libX11,
libxcb,
pkg-config,
xcbutil,
libxcb-util,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libX11
libxcb
xcbutil
libxcb-util
];
meta = {
+2 -2
View File
@@ -5,7 +5,7 @@
cmake,
pkg-config,
libX11,
libpthreadstubs,
libpthread-stubs,
libXau,
libXdmcp,
libXext,
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
buildInputs = [
libX11
libpthreadstubs
libpthread-stubs
libXau
libXdmcp
libXext
+4 -4
View File
@@ -7,8 +7,8 @@
pkg-config,
xfce4-dev-tools,
wrapGAppsHook3,
libICE,
libSM,
libice,
libsm,
libepoxy,
libgtop,
libgudev,
@@ -55,8 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
libICE
libSM
libice
libsm
libepoxy
libgtop
libgudev
+4 -4
View File
@@ -7,8 +7,8 @@
libX11,
libXext,
xorgproto,
libICE,
libSM,
libice,
libsm,
libpng12,
zlib,
}:
@@ -25,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
buildInputs = [
libICE
libice
libpng12
libSM
libsm
libX11
libXext
xorgproto
+4 -4
View File
@@ -14,8 +14,8 @@
systemd,
libusb-compat-0_1,
libftdi1,
libICE,
libSM,
libice,
libsm,
libX11,
}:
@@ -90,8 +90,8 @@ stdenv.mkDerivation rec {
systemd
libusb-compat-0_1
libftdi1
libICE
libSM
libice
libsm
libX11
];
+4 -4
View File
@@ -13,8 +13,8 @@
graphicsmagick,
ffmpeg,
zlib,
libSM,
libICE,
libsm,
libice,
stb,
openssl,
xxHash,
@@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
graphicsmagick
ffmpeg
zlib
libSM
libICE
libsm
libice
stb
openssl
xxHash
+4 -4
View File
@@ -24,8 +24,8 @@
docutils,
libxcb,
libX11,
xcbutil,
xcbutilwm,
libxcb-util,
libxcb-wm,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -48,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
libxcb
libX11
xcbutil
xcbutilwm
libxcb-util
libxcb-wm
libXdmcp
libXau
libpulseaudio
+6 -6
View File
@@ -10,8 +10,8 @@
libX11,
lttng-ust,
icu,
libICE,
libSM,
libice,
libsm,
libXcursor,
openssl,
imagemagick,
@@ -35,8 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
fontconfig.lib
# Runtime deps
libICE
libSM
libice
libsm
libX11
libXcursor
];
@@ -63,8 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
# will add to the RPATH of executable only
runtimeDependencies = [
libICE
libSM
libice
libsm
libX11
libXcursor
];

Some files were not shown because too many files have changed in this diff Show More