From 7d8132a92cb220bdbff2a0f427ab17e4bec7b016 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Fri, 23 Jan 2026 15:56:11 +0100 Subject: [PATCH] treewide: remove references to the xorg namespace in `pkgs` (automated) this creates some eval errors that will be fixed in the next commit done with the following script: ```fish \#!/usr/bin/env fish set packagesjson (nix eval --impure --json --expr ' let lib = import ./lib; in import pkgs/servers/x11/xorg/default.nix (lib.mapAttrs ( name: _: if name == "lib" then lib else if name == "config" then { allowAliases = false; } else name ) (__functionArgs (import pkgs/servers/x11/xorg/default.nix))) { } ' | jq) set one (grep '^ [A-Za-z0-9_-]*$' pkgs/servers/x11/xorg/default.nix | string trim | string replace -r '$' Z | sort | string sub -e -1) set two (grep '^ [A-Za-z0-9_-]* = [A-Za-z0-9_-]*;$' pkgs/servers/x11/xorg/default.nix | cut -d= -f1 | string trim | string replace -r '$' Z | sort | string sub -e -1) for arg in $one $two set oname $arg set nname (echo $packagesjson | jq -r .$oname) if test $nname = null echo (set_color red)warn:(set_color normal) unknown package xorg.$oname >&2 continue end echo $oname "->" $nname # replace basic xorg.$name references for file in (rg -F "xorg.$oname" --files-with-matches pkgs) # special cases sd -F "$oname = xorg.$oname;" "$nname = $nname;" $file # replace sd -F "xorg.$oname" "$nname" $file # fixup function arguments # prevent duplicate function args if grep -E " ($oname|$nname),\$" $file >/dev/null continue end if grep 'xorg\..' $file >/dev/null # case1: there is more so we can't just remove the function arg if grep ' xorg,$' $file >/dev/null sd ' xorg,$' " xorg, $nname," $file else if grep ' xorg ? .*,$' $file >/dev/null sd 'xorg( ? .*),$' "xorg\$1, $nname," $file else sd -F 'xorg,' "$nname, xorg," $file end else # case there is no more xorg..* so we can just replace the function arg sd 'xorg(| ? .*),.*$' "$nname," $file end end end nix fmt ``` --- .../audio/bitwig-studio/bitwig-studio4.nix | 19 +- .../audio/bitwig-studio/bitwig-studio5.nix | 19 +- .../audio/open-music-kontrollers/mephisto.nix | 7 +- .../applications/backup/timeshift/wrapper.nix | 4 +- .../editors/android-studio/common.nix | 7 +- .../editors/jetbrains/ides/rider.nix | 4 +- .../editors/jetbrains/source/build.nix | 4 +- .../applications/editors/sublime/3/common.nix | 4 +- .../applications/editors/sublime/4/common.nix | 7 +- .../editors/vim/plugins/overrides.nix | 4 +- pkgs/applications/editors/vscode/generic.nix | 25 ++- .../emulators/libretro/cores/bsnes-hd.nix | 7 +- .../emulators/libretro/cores/desmume.nix | 4 +- .../emulators/libretro/cores/desmume2015.nix | 4 +- .../emulators/libretro/cores/dolphin.nix | 31 ++- .../emulators/libretro/cores/mupen64plus.nix | 4 +- .../emulators/libretro/cores/play.nix | 4 +- .../emulators/libretro/cores/ppsspp.nix | 4 +- .../emulators/libretro/cores/same_cdi.nix | 4 +- pkgs/applications/emulators/wine/base.nix | 20 +- .../graphics/gimp/2.0/default.nix | 4 +- pkgs/applications/graphics/gimp/default.nix | 7 +- .../corekeyboard/default.nix | 7 +- .../cubocore-packages/corestuff/default.nix | 4 +- .../coretoppings/default.nix | 10 +- .../misc/maliit-framework/default.nix | 7 +- pkgs/applications/misc/opencpn/default.nix | 7 +- .../applications/misc/organicmaps/default.nix | 10 +- .../misc/prusa-slicer/default.nix | 4 +- .../networking/browsers/firefox/wrapper.nix | 19 +- .../networking/dropbox/default.nix | 28 +-- .../instant-messengers/ferdium/default.nix | 4 +- .../instant-messengers/franz/generic.nix | 34 ++-- .../instant-messengers/ripcord/default.nix | 17 +- .../networking/netmaker/default.nix | 16 +- .../networking/p2p/transmission/4.nix | 4 +- .../remote/citrix-workspace/generic.nix | 43 ++-- .../office/libreoffice/default.nix | 28 ++- .../office/libreoffice/wrapper.nix | 4 +- pkgs/applications/radio/soapysdr/default.nix | 2 +- .../science/electronics/bitscope/common.nix | 4 +- .../science/math/cplex/default.nix | 6 +- .../science/math/wolfram-engine/default.nix | 37 ++-- .../sublime-merge/common.nix | 4 +- .../applications/video/obs-studio/default.nix | 4 +- .../obs-studio/plugins/input-overlay.nix | 25 ++- .../video/streamlink-twitch-gui/bin.nix | 37 ++-- .../video/vdr/softhddevice/default.nix | 7 +- .../virtualbox/guest-additions/builder.nix | 9 +- .../virtualbox/guest-additions/default.nix | 25 ++- .../window-managers/awesome/default.nix | 28 ++- .../window-managers/i3/default.nix | 7 +- .../window-managers/i3/easyfocus.nix | 4 +- .../window-managers/i3/lock-color.nix | 4 +- .../window-managers/i3/lock-fancy-rapid.nix | 4 +- pkgs/applications/window-managers/i3/lock.nix | 4 +- .../window-managers/i3/wmfocus.nix | 4 +- .../window-managers/jwm/default.nix | 4 +- .../window-managers/wayfire/default.nix | 4 +- pkgs/build-support/appimage/default.nix | 54 ++--- .../build-mozilla-mach/default.nix | 34 ++-- pkgs/build-support/build-nim-sbom.nix | 4 +- .../build-rust-crate/test/rcgen-crates.nix | 2 +- pkgs/by-name/_0/_010editor/package.nix | 6 +- pkgs/by-name/_1/_1fps/package.nix | 10 +- pkgs/by-name/ac/activate-linux/package.nix | 25 ++- pkgs/by-name/ai/airgeddon/package.nix | 7 +- pkgs/by-name/ai/airtame/package.nix | 16 +- pkgs/by-name/ai/airwin2rack/package.nix | 22 +- .../aj/aja-desktop-software/package.nix | 16 +- pkgs/by-name/al/alacritty/package.nix | 16 +- pkgs/by-name/al/alfaview/package.nix | 16 +- pkgs/by-name/al/alttab/package.nix | 25 ++- .../by-name/al/alttpr-opentracker/package.nix | 13 +- pkgs/by-name/am/am2rlauncher/package.nix | 8 +- pkgs/by-name/am/amoeba/package.nix | 4 +- pkgs/by-name/an/anakron/package.nix | 4 +- pkgs/by-name/an/anarch/package.nix | 19 +- pkgs/by-name/an/angle/package.nix | 13 +- pkgs/by-name/an/angr-management/package.nix | 4 +- pkgs/by-name/an/animatch/package.nix | 4 +- pkgs/by-name/an/animeko/package.nix | 4 +- pkgs/by-name/an/anki-bin/package.nix | 4 +- pkgs/by-name/an/anttweakbar/package.nix | 4 +- pkgs/by-name/an/anvil-editor/package.nix | 13 +- pkgs/by-name/an/anydesk/package.nix | 43 ++-- pkgs/by-name/ap/appgate-sdp/package.nix | 40 ++-- pkgs/by-name/ar/ardour/package.nix | 7 +- pkgs/by-name/as/astrolog/package.nix | 4 +- pkgs/by-name/as/astromenace/package.nix | 10 +- pkgs/by-name/at/atlauncher/package.nix | 10 +- pkgs/by-name/av/avocode/package.nix | 40 ++-- pkgs/by-name/az/azahar/package.nix | 10 +- pkgs/by-name/az/azuredatastudio/package.nix | 28 ++- pkgs/by-name/ba/badlion-client/package.nix | 2 +- pkgs/by-name/ba/bambu-studio/package.nix | 4 +- pkgs/by-name/ba/basalt-monado/package.nix | 4 +- pkgs/by-name/ba/bashrun2/package.nix | 4 +- pkgs/by-name/bb/bb/package.nix | 10 +- pkgs/by-name/be/beekeeper-studio/package.nix | 22 +- pkgs/by-name/be/bemenu/package.nix | 19 +- pkgs/by-name/be/bepass/package.nix | 4 +- pkgs/by-name/be/betterlockscreen/package.nix | 10 +- pkgs/by-name/bi/binocle/package.nix | 13 +- pkgs/by-name/bi/bitwig-studio3/package.nix | 19 +- pkgs/by-name/bl/bloodhound/package.nix | 39 ++-- pkgs/by-name/bl/bluespec/package.nix | 4 +- pkgs/by-name/bo/boilr/package.nix | 16 +- pkgs/by-name/bo/bolt-launcher/package.nix | 21 +- pkgs/by-name/bo/boops/package.nix | 4 +- pkgs/by-name/bo/bottles/package.nix | 32 +-- pkgs/by-name/br/brave/make-brave.nix | 4 +- pkgs/by-name/bs/bsequencer/package.nix | 4 +- pkgs/by-name/bs/bshapr/package.nix | 4 +- pkgs/by-name/bs/bslizr/package.nix | 4 +- .../budgie-desktop-with-plugins/package.nix | 4 +- .../by-name/bu/budgie-screensaver/package.nix | 4 +- pkgs/by-name/bu/budgie-session/package.nix | 4 +- pkgs/by-name/bu/bumblebee-status/plugins.nix | 16 +- pkgs/by-name/bu/burpsuite/package.nix | 14 +- pkgs/by-name/by/byzanz/package.nix | 7 +- .../ca/caprine-bin/build-from-appimage.nix | 4 +- pkgs/by-name/ca/cargo-ui/package.nix | 16 +- pkgs/by-name/ca/catclock/package.nix | 10 +- pkgs/by-name/ce/cef-binary/package.nix | 25 ++- pkgs/by-name/ce/celeste64/package.nix | 19 +- pkgs/by-name/ce/celestegame/package.nix | 28 +-- pkgs/by-name/ce/centerpiece/package.nix | 13 +- pkgs/by-name/ce/cernlib/package.nix | 13 +- pkgs/by-name/cg/cgminer/package.nix | 10 +- pkgs/by-name/cg/cgns/package.nix | 4 +- pkgs/by-name/ch/cherry/package.nix | 7 +- pkgs/by-name/ci/cinnamon-desktop/package.nix | 10 +- .../ci/cinnamon-screensaver/package.nix | 13 +- pkgs/by-name/ci/cinnamon-session/package.nix | 22 +- .../ci/cinnamon-settings-daemon/package.nix | 10 +- .../by-name/ci/ciscoPacketTracer7/package.nix | 13 +- .../by-name/ci/ciscoPacketTracer8/package.nix | 55 +++-- pkgs/by-name/cl/clanlib/package.nix | 4 +- pkgs/by-name/cl/clapper/package.nix | 4 +- pkgs/by-name/cl/claws-mail/package.nix | 4 +- pkgs/by-name/cl/clearlyU/package.nix | 7 +- pkgs/by-name/cl/clickup/package.nix | 2 +- pkgs/by-name/cl/clipboard-jh/package.nix | 4 +- pkgs/by-name/cn/cnping/package.nix | 10 +- pkgs/by-name/co/code-server/package.nix | 7 +- pkgs/by-name/co/codeql/package.nix | 16 +- pkgs/by-name/co/cogl/package.nix | 13 +- pkgs/by-name/co/colmap/package.nix | 4 +- pkgs/by-name/co/commandergenius/package.nix | 4 +- pkgs/by-name/co/conda/package.nix | 21 +- pkgs/by-name/co/conduktor/package.nix | 4 +- pkgs/by-name/co/coppwr/package.nix | 10 +- pkgs/by-name/co/cov-build/package.nix | 10 +- pkgs/by-name/cr/creep/package.nix | 7 +- pkgs/by-name/cr/crossfire-client/package.nix | 7 +- pkgs/by-name/cr/crusader/package.nix | 10 +- pkgs/by-name/cu/curv/package.nix | 19 +- pkgs/by-name/da/daktilo/package.nix | 10 +- pkgs/by-name/da/darkplaces/package.nix | 4 +- pkgs/by-name/da/davinci-resolve/package.nix | 69 ++++--- pkgs/by-name/db/dbus/package.nix | 10 +- pkgs/by-name/dd/ddcutil/package.nix | 7 +- pkgs/by-name/de/deezer-enhanced/package.nix | 36 ++-- pkgs/by-name/de/densify/package.nix | 4 +- pkgs/by-name/di/dina-font/package.nix | 7 +- pkgs/by-name/di/directfb/package.nix | 13 +- pkgs/by-name/di/displaycal/package.nix | 16 +- pkgs/by-name/dj/djview/package.nix | 4 +- pkgs/by-name/dr/dragonfly-reverb/package.nix | 4 +- pkgs/by-name/dr/drawterm/package.nix | 7 +- pkgs/by-name/dr/dreamchess/package.nix | 7 +- pkgs/by-name/dr/drumkv1/package.nix | 4 +- pkgs/by-name/e-/e-search/package.nix | 16 +- pkgs/by-name/ed/eduke32/package.nix | 4 +- pkgs/by-name/ef/efont-unicode/package.nix | 10 +- pkgs/by-name/eg/ego/package.nix | 4 +- pkgs/by-name/el/electricsheep/package.nix | 4 +- pkgs/by-name/el/electron-fiddle/package.nix | 26 +-- pkgs/by-name/el/eli/package.nix | 13 +- pkgs/by-name/en/enpass/package.nix | 34 ++-- pkgs/by-name/en/entangle/package.nix | 7 +- pkgs/by-name/en/envision/package.nix | 10 +- pkgs/by-name/en/envypn-font/package.nix | 7 +- pkgs/by-name/ep/epick/package.nix | 13 +- pkgs/by-name/eq/eq10q/package.nix | 10 +- pkgs/by-name/et/etterna/package.nix | 16 +- pkgs/by-name/eu/eureka-editor/package.nix | 4 +- pkgs/by-name/ev/everspace/package.nix | 34 ++-- pkgs/by-name/ex/exegol/package.nix | 4 +- pkgs/by-name/ex/exegol4/package.nix | 4 +- pkgs/by-name/ex/exodus/package.nix | 40 ++-- pkgs/by-name/fa/fastcompmgr/package.nix | 16 +- pkgs/by-name/fa/fastfetch/package.nix | 10 +- pkgs/by-name/fb/fbmenugen/package.nix | 6 +- pkgs/by-name/fe/feather-tk/package.nix | 4 +- pkgs/by-name/fe/feh/package.nix | 10 +- pkgs/by-name/fe/fex/package.nix | 16 +- pkgs/by-name/fi/firefoxpwa/package.nix | 4 +- pkgs/by-name/fl/flaresolverr/package.nix | 4 +- pkgs/by-name/fl/flatpak/package.nix | 4 +- pkgs/by-name/fl/flitter/package.nix | 4 +- pkgs/by-name/fo/forgejo/generic.nix | 4 +- pkgs/by-name/fr/frame/package.nix | 13 +- pkgs/by-name/fu/furtherance/package.nix | 13 +- .../by-name/ga/galaxy-buds-client/package.nix | 10 +- pkgs/by-name/ga/gamescope/package.nix | 43 ++-- pkgs/by-name/ga/gapcast/package.nix | 4 +- pkgs/by-name/ga/gauge/package.nix | 4 +- pkgs/by-name/gd/gdlauncher-carbon/package.nix | 24 ++- pkgs/by-name/ge/geis/package.nix | 13 +- pkgs/by-name/ge/gencfsm/package.nix | 7 +- pkgs/by-name/ge/genymotion/package.nix | 4 +- pkgs/by-name/ge/geogebra/package.nix | 4 +- pkgs/by-name/gf/gfxstream/package.nix | 4 +- pkgs/by-name/gh/ghostscript/package.nix | 13 +- pkgs/by-name/gi/giac/package.nix | 4 +- pkgs/by-name/gi/gimx/package.nix | 7 +- pkgs/by-name/gi/github-desktop/package.nix | 7 +- pkgs/by-name/gl/glee/package.nix | 4 +- pkgs/by-name/gm/gmsh/package.nix | 28 ++- pkgs/by-name/gn/gnome-flashback/package.nix | 4 +- pkgs/by-name/gn/gnome-panel/wrapper.nix | 6 +- pkgs/by-name/gn/gnome-session/package.nix | 4 +- pkgs/by-name/go/go-hass-agent/package.nix | 16 +- pkgs/by-name/go/go-sct/package.nix | 7 +- pkgs/by-name/go/go2tv/package.nix | 22 +- pkgs/by-name/go/gobble/package.nix | 4 +- pkgs/by-name/go/gohufont/package.nix | 7 +- pkgs/by-name/go/gomanagedocker/package.nix | 4 +- pkgs/by-name/go/goose-cli/package.nix | 4 +- pkgs/by-name/gp/gpac/package.nix | 10 +- pkgs/by-name/gr/grail/package.nix | 16 +- pkgs/by-name/gr/graphite/package.nix | 10 +- pkgs/by-name/gr/grayjay/package.nix | 22 +- pkgs/by-name/gr/gromit-mpx/package.nix | 4 +- pkgs/by-name/gt/gtk3/package.nix | 31 ++- pkgs/by-name/gt/gtk4/package.nix | 25 ++- pkgs/by-name/gw/gwyddion/package.nix | 4 +- pkgs/by-name/gx/gxmatcheq-lv2/package.nix | 4 +- pkgs/by-name/gx/gxplugins-lv2/package.nix | 4 +- pkgs/by-name/ha/hakuneko/package.nix | 7 +- pkgs/by-name/ha/halloy/package.nix | 13 +- pkgs/by-name/he/helio-workstation/package.nix | 19 +- pkgs/by-name/he/helm/package.nix | 22 +- pkgs/by-name/he/hey-mail/package.nix | 34 ++-- pkgs/by-name/hh/hhpc/package.nix | 4 +- pkgs/by-name/hi/highlight-pointer/package.nix | 7 +- pkgs/by-name/hm/hmcl/package.nix | 22 +- pkgs/by-name/ho/houdini/package.nix | 52 ++--- pkgs/by-name/ho/hover/package.nix | 31 ++- pkgs/by-name/ht/hterm/package.nix | 4 +- pkgs/by-name/hy/hyprland/package.nix | 16 +- pkgs/by-name/id/ida-free/package.nix | 40 ++-- pkgs/by-name/id/ideogram/package.nix | 7 +- pkgs/by-name/im/imlib2/package.nix | 7 +- pkgs/by-name/im/immersed/linux.nix | 4 +- pkgs/by-name/im/imnodes/package.nix | 4 +- pkgs/by-name/im/imv/package.nix | 7 +- pkgs/by-name/in/inlyne/package.nix | 16 +- pkgs/by-name/in/intune-portal/package.nix | 4 +- pkgs/by-name/in/inxi/package.nix | 10 +- pkgs/by-name/ip/ipmiview/package.nix | 16 +- pkgs/by-name/ip/ipscan/package.nix | 4 +- pkgs/by-name/is/isle-portable/package.nix | 25 ++- pkgs/by-name/jf/jfbview/package.nix | 4 +- pkgs/by-name/jg/jgmenu/package.nix | 7 +- pkgs/by-name/ji/jibri/package.nix | 11 +- pkgs/by-name/ji/jitsi/package.nix | 13 +- pkgs/by-name/jo/jogl/package.nix | 22 +- pkgs/by-name/js/jstest-gtk/package.nix | 4 +- pkgs/by-name/ju/jumpy/package.nix | 13 +- .../ka/kapitonov-plugins-pack/package.nix | 4 +- pkgs/by-name/kb/kbdd/package.nix | 4 +- pkgs/by-name/kb/kbt/package.nix | 4 +- pkgs/by-name/kd/kdash/package.nix | 4 +- pkgs/by-name/ke/keepass/package.nix | 4 +- .../ke/keyboard-layout-editor/package.nix | 4 +- .../package.nix | 27 ++- pkgs/by-name/ki/kime/package.nix | 4 +- pkgs/by-name/ki/kingstvis/package.nix | 22 +- pkgs/by-name/ki/kirsch/package.nix | 4 +- pkgs/by-name/kn/knobkraft-orm/package.nix | 7 +- pkgs/by-name/kr/krillinai/package.nix | 19 +- pkgs/by-name/la/lapce/package.nix | 19 +- pkgs/by-name/la/lattice-diamond/package.nix | 19 +- pkgs/by-name/la/lazpaint/package.nix | 4 +- pkgs/by-name/la/lazysql/package.nix | 4 +- .../le/legends-of-equestria/package.nix | 37 ++-- pkgs/by-name/li/liana/package.nix | 13 +- pkgs/by-name/li/libation/package.nix | 10 +- pkgs/by-name/li/libcaca/package.nix | 7 +- pkgs/by-name/li/libclxclient/package.nix | 6 +- pkgs/by-name/li/libcosmicAppHook/package.nix | 13 +- pkgs/by-name/li/libgaminggear/package.nix | 7 +- pkgs/by-name/li/libprojectm/package.nix | 4 +- pkgs/by-name/li/libresprite/package.nix | 4 +- pkgs/by-name/li/libtas/package.nix | 4 +- pkgs/by-name/li/libuiohook/package.nix | 25 ++- pkgs/by-name/li/libvdpau/package.nix | 10 +- pkgs/by-name/li/libxkbcommon_8/package.nix | 4 +- pkgs/by-name/li/libxklavier/package.nix | 16 +- pkgs/by-name/li/lightburn/package.nix | 7 +- .../li/lightdm-enso-os-greeter/package.nix | 10 +- pkgs/by-name/li/livecaptions/package.nix | 4 +- pkgs/by-name/lo/lobster/package.nix | 7 +- pkgs/by-name/lu/luanti/package.nix | 7 +- pkgs/by-name/lu/lutgen-studio/package.nix | 13 +- pkgs/by-name/lu/lutris-unwrapped/package.nix | 7 +- pkgs/by-name/lu/lutris/package.nix | 44 ++-- pkgs/by-name/lv/lv2lint/package.nix | 4 +- pkgs/by-name/ly/LycheeSlicer/package.nix | 4 +- pkgs/by-name/ma/maiko/package.nix | 6 +- pkgs/by-name/ma/mailspring/linux.nix | 16 +- pkgs/by-name/ma/marktext/package.nix | 10 +- pkgs/by-name/ma/mathematica/generic.nix | 49 +++-- .../mc/mcpelauncher-client/package.nix | 10 +- pkgs/by-name/me/mediagoblin/package.nix | 4 +- pkgs/by-name/me/megaglest/package.nix | 15 +- pkgs/by-name/me/megapixels/package.nix | 4 +- pkgs/by-name/me/megasync/package.nix | 4 +- pkgs/by-name/me/melmatcheq-lv2/package.nix | 4 +- pkgs/by-name/me/menyoki/package.nix | 7 +- pkgs/by-name/me/metacity/package.nix | 13 +- .../mi/microsoft-identity-broker/package.nix | 4 +- pkgs/by-name/mi/minivmac/package.nix | 4 +- pkgs/by-name/mo/mochi/package.nix | 4 +- pkgs/by-name/mo/modrinth-app/package.nix | 19 +- pkgs/by-name/mo/molden/package.nix | 7 +- pkgs/by-name/mo/mongodb-compass/package.nix | 40 ++-- .../by-name/mo/moonlight-embedded/package.nix | 7 +- pkgs/by-name/mo/mousetweaks/package.nix | 13 +- pkgs/by-name/mq/mqttx/package.nix | 2 +- pkgs/by-name/mr/mricron/package.nix | 4 +- pkgs/by-name/ms/mslicer/package.nix | 13 +- pkgs/by-name/mu/mullvad-vpn/package.nix | 40 ++-- .../by-name/mu/multiviewer-for-f1/package.nix | 22 +- pkgs/by-name/mu/multivnc/package.nix | 7 +- pkgs/by-name/nc/ncview/package.nix | 16 +- pkgs/by-name/ne/neothesia/package.nix | 13 +- pkgs/by-name/ne/neovide/package.nix | 16 +- pkgs/by-name/ne/netgen/package.nix | 4 +- pkgs/by-name/ne/neuron/package.nix | 10 +- .../ne/nextcloud-talk-desktop/package.nix | 19 +- pkgs/by-name/ni/ninjas2/package.nix | 4 +- pkgs/by-name/no/nordpass/package.nix | 46 +++-- pkgs/by-name/no/normcap/package.nix | 4 +- pkgs/by-name/nu/numworks-epsilon/package.nix | 4 +- pkgs/by-name/nx/nx-libs/package.nix | 46 +++-- pkgs/by-name/nz/nzportable/fteqw.nix | 31 +-- pkgs/by-name/od/odamex/package.nix | 7 +- pkgs/by-name/og/ogre-next/package.nix | 16 +- .../om/omnissa-horizon-client/package.nix | 22 +- pkgs/by-name/on/onagre/package.nix | 13 +- pkgs/by-name/on/onboard/package.nix | 7 +- .../on/onlyoffice-desktopeditors/package.nix | 39 ++-- pkgs/by-name/op/opencomposite/package.nix | 4 +- pkgs/by-name/op/openmeters/package.nix | 13 +- pkgs/by-name/op/openroad/package.nix | 4 +- pkgs/by-name/op/openscad-unstable/package.nix | 4 +- pkgs/by-name/op/opensoldat/package.nix | 6 +- pkgs/by-name/op/opensubdiv/package.nix | 19 +- pkgs/by-name/op/opensurge/package.nix | 4 +- pkgs/by-name/op/openvscode-server/package.nix | 7 +- pkgs/by-name/or/orca-slicer/package.nix | 4 +- pkgs/by-name/or/oreo-cursors-plus/package.nix | 4 +- pkgs/by-name/os/osu-lazer/package.nix | 4 +- pkgs/by-name/pa/paperless-ngx/package.nix | 4 +- pkgs/by-name/pa/par-lang/package.nix | 13 +- pkgs/by-name/pa/partio/package.nix | 7 +- pkgs/by-name/pa/pax-britannica/package.nix | 7 +- pkgs/by-name/pc/pcb/package.nix | 7 +- pkgs/by-name/pe/peazip/package.nix | 4 +- pkgs/by-name/pe/pencil/package.nix | 37 ++-- pkgs/by-name/ph/phoc/package.nix | 4 +- pkgs/by-name/ph/photon-rss/package.nix | 4 +- pkgs/by-name/pi/picocrypt-ng/package.nix | 4 +- pkgs/by-name/pi/picocrypt/package.nix | 4 +- pkgs/by-name/pi/pinball/package.nix | 4 +- pkgs/by-name/pi/pixinsight/package.nix | 28 ++- .../pl/planetary_annihilation/package.nix | 28 ++- pkgs/by-name/pl/plasticity/package.nix | 25 ++- .../pl/plasticscm-client-gui/package.nix | 10 +- pkgs/by-name/pl/playonlinux/package.nix | 6 +- pkgs/by-name/pl/plex-desktop/package.nix | 37 ++-- pkgs/by-name/pl/plex-htpc/package.nix | 37 ++-- pkgs/by-name/pl/plplot/package.nix | 4 +- pkgs/by-name/pl/plymouth/package.nix | 4 +- pkgs/by-name/po/positron-bin/package.nix | 13 +- pkgs/by-name/po/posting/package.nix | 4 +- pkgs/by-name/po/postman/linux.nix | 7 +- pkgs/by-name/po/powertop/package.nix | 4 +- pkgs/by-name/pr/prl-tools/package.nix | 23 ++- pkgs/by-name/pr/profont/package.nix | 4 +- pkgs/by-name/pu/publii/package.nix | 7 +- pkgs/by-name/pu/pugl/package.nix | 13 +- pkgs/by-name/pu/pulsar/package.nix | 30 ++- pkgs/by-name/pw/pw-viz/package.nix | 13 +- pkgs/by-name/qq/qq/package.nix | 4 +- pkgs/by-name/qq/qqmusic/package.nix | 37 ++-- .../by-name/qu/quartus-prime-lite/package.nix | 22 +- pkgs/by-name/qu/quickshell/package.nix | 4 +- pkgs/by-name/ra/raccoin/package.nix | 15 +- pkgs/by-name/ra/radeontools/package.nix | 4 +- pkgs/by-name/ra/rapidraw/package.nix | 25 ++- .../re/react-native-debugger/package.nix | 37 ++-- pkgs/by-name/re/recaf-launcher/package.nix | 6 +- pkgs/by-name/re/restish/package.nix | 16 +- pkgs/by-name/ri/ringboard/package.nix | 13 +- pkgs/by-name/ri/ripasso-cursive/package.nix | 4 +- pkgs/by-name/rl/rlaunch/package.nix | 10 +- pkgs/by-name/rn/rnnoise-plugin/package.nix | 7 +- pkgs/by-name/ro/robo3t/package.nix | 22 +- pkgs/by-name/ro/root/package.nix | 13 +- pkgs/by-name/rt/rtabmap/package.nix | 10 +- pkgs/by-name/ru/runelite/package.nix | 4 +- pkgs/by-name/ru/runescape/package.nix | 2 +- .../ru/rusty-path-of-building/package.nix | 10 +- pkgs/by-name/ru/rusty-psn/package.nix | 18 +- pkgs/by-name/rx/rx/package.nix | 19 +- pkgs/by-name/ry/rymdport/package.nix | 22 +- .../by-name/s0/s0ix-selftest-tool/package.nix | 4 +- pkgs/by-name/sa/saber/package.nix | 4 +- pkgs/by-name/sa/safecloset/package.nix | 4 +- pkgs/by-name/sa/saleae-logic-2/package.nix | 24 +-- pkgs/by-name/sa/sauerbraten/package.nix | 4 +- pkgs/by-name/sc/scilab-bin/package.nix | 28 ++- pkgs/by-name/sc/screen-pipe/package.nix | 4 +- pkgs/by-name/sc/screenkey/package.nix | 7 +- pkgs/by-name/se/seamly2d/package.nix | 10 +- pkgs/by-name/se/segger-jlink/qt4-bundled.nix | 19 +- pkgs/by-name/se/servo/package.nix | 16 +- pkgs/by-name/sf/sfizz-ui/package.nix | 28 ++- pkgs/by-name/sf/sfizz/package.nix | 28 ++- pkgs/by-name/sh/shadershark/package.nix | 4 +- .../sh/shticker-book-unwritten/package.nix | 6 +- pkgs/by-name/si/sidequest/package.nix | 27 ++- .../by-name/si/signal-desktop-bin/generic.nix | 7 +- pkgs/by-name/si/siji/package.nix | 7 +- pkgs/by-name/si/sitespeed-io/package.nix | 4 +- pkgs/by-name/sl/slack/linux.nix | 40 ++-- pkgs/by-name/sl/slint-lsp/package.nix | 15 +- pkgs/by-name/sn/snake4/package.nix | 16 +- pkgs/by-name/sn/snd/package.nix | 13 +- pkgs/by-name/sn/sniffnet/package.nix | 15 +- .../by-name/sn/snippetexpandergui/package.nix | 4 +- pkgs/by-name/sn/snippetexpanderx/package.nix | 4 +- pkgs/by-name/sn/snippetpixie/package.nix | 4 +- pkgs/by-name/sn/snowemu/package.nix | 13 +- pkgs/by-name/so/socalabs-sid/package.nix | 25 ++- pkgs/by-name/so/sointu/package.nix | 10 +- pkgs/by-name/so/solvespace/package.nix | 10 +- pkgs/by-name/so/sommelier/package.nix | 4 +- pkgs/by-name/sp/spleen/package.nix | 4 +- pkgs/by-name/sp/spotify/linux.nix | 46 +++-- .../by-name/st/stardust-xr-server/package.nix | 7 +- pkgs/by-name/st/starsector/package.nix | 7 +- pkgs/by-name/st/staruml/package.nix | 37 ++-- pkgs/by-name/st/steam/package.nix | 2 +- pkgs/by-name/st/steamtinkerlaunch/package.nix | 10 +- pkgs/by-name/st/stepmania/package.nix | 4 +- pkgs/by-name/st/stm32cubemx/package.nix | 14 +- pkgs/by-name/st/stone-phaser/package.nix | 4 +- pkgs/by-name/st/stumpish/package.nix | 6 +- pkgs/by-name/st/styluslabs-write/package.nix | 10 +- pkgs/by-name/su/sublime/package.nix | 4 +- pkgs/by-name/su/sumo/package.nix | 19 +- pkgs/by-name/su/sunshine/package.nix | 21 +- pkgs/by-name/su/supermodel/package.nix | 4 +- pkgs/by-name/su/supersonic/package.nix | 22 +- pkgs/by-name/su/surf-display/package.nix | 7 +- pkgs/by-name/su/surf/package.nix | 4 +- pkgs/by-name/sv/svp/package.nix | 4 +- pkgs/by-name/sw/sway-unwrapped/package.nix | 4 +- pkgs/by-name/sw/switchres/package.nix | 12 +- pkgs/by-name/sx/sx/package.nix | 7 +- pkgs/by-name/sx/sxcs/package.nix | 7 +- pkgs/by-name/sy/sylk/package.nix | 4 +- pkgs/by-name/sy/systeroid/package.nix | 4 +- pkgs/by-name/ta/tableplus/linux.nix | 22 +- pkgs/by-name/ta/tacentview/package.nix | 7 +- pkgs/by-name/ta/tamsyn/package.nix | 4 +- pkgs/by-name/ta/tamzen/package.nix | 4 +- pkgs/by-name/ta/tau-hydrogen/package.nix | 4 +- pkgs/by-name/ta/tauon/package.nix | 4 +- pkgs/by-name/te/teamspeak6-client/package.nix | 19 +- pkgs/by-name/te/ted/package.nix | 13 +- pkgs/by-name/te/terminus_font/package.nix | 4 +- pkgs/by-name/te/tetraproc/package.nix | 16 +- pkgs/by-name/te/tetrd/package.nix | 10 +- pkgs/by-name/te/tev/package.nix | 16 +- pkgs/by-name/ti/tigervnc/package.nix | 73 ++++--- pkgs/by-name/to/tomboy-ng/package.nix | 4 +- pkgs/by-name/to/tome4/package.nix | 7 +- pkgs/by-name/to/touchegg/package.nix | 22 +- pkgs/by-name/tr/tradingview/package.nix | 10 +- pkgs/by-name/tr/transito/package.nix | 13 +- pkgs/by-name/tr/trillian-im/package.nix | 4 +- pkgs/by-name/tt/ttygif/package.nix | 4 +- pkgs/by-name/tv/tvbrowser/test.nix | 4 +- pkgs/by-name/ty/typora/package.nix | 16 +- pkgs/by-name/uc/ucs-fonts/package.nix | 7 +- pkgs/by-name/ue/ueberzugpp/package.nix | 7 +- pkgs/by-name/uh/uhhyou-plugins/package.nix | 4 +- pkgs/by-name/ui/uiua/package.nix | 13 +- pkgs/by-name/un/uni-vga/package.nix | 7 +- pkgs/by-name/un/unicon-lang/package.nix | 4 +- pkgs/by-name/un/unifont/package.nix | 7 +- pkgs/by-name/un/unityhub/package.nix | 26 +-- .../universal-android-debloater/package.nix | 13 +- pkgs/by-name/un/unixbench/package.nix | 10 +- pkgs/by-name/ur/urdf-viz/package.nix | 26 ++- pkgs/by-name/uw/uw-ttyp0/package.nix | 7 +- pkgs/by-name/ux/uxn11/package.nix | 6 +- pkgs/by-name/v2/v2rayn/package.nix | 22 +- pkgs/by-name/va/vanilla-dmz/package.nix | 4 +- pkgs/by-name/ve/vesta-viewer/package.nix | 7 +- pkgs/by-name/vi/viber/package.nix | 60 ++++-- pkgs/by-name/vi/vinegar/package.nix | 10 +- pkgs/by-name/vi/vintagestory/package.nix | 10 +- pkgs/by-name/vi/visp/package.nix | 4 +- pkgs/by-name/vi/vital/package.nix | 10 +- pkgs/by-name/vk/vk-messenger/package.nix | 13 +- pkgs/by-name/vl/vlang/package.nix | 13 +- .../by-name/vm/vmware-workstation/package.nix | 50 +++-- pkgs/by-name/vo/volctl/package.nix | 6 +- pkgs/by-name/vo/voxinput/package.nix | 19 +- pkgs/by-name/wa/warp-terminal/package.nix | 13 +- pkgs/by-name/wa/wasabiwallet/package.nix | 10 +- pkgs/by-name/wa/wasistlos/package.nix | 7 +- pkgs/by-name/wa/waywall/package.nix | 4 +- pkgs/by-name/we/weasis/package.nix | 10 +- pkgs/by-name/we/wechat-uos/package.nix | 52 +++-- pkgs/by-name/we/wemeet/package.nix | 28 ++- pkgs/by-name/we/weylus/package.nix | 34 ++-- pkgs/by-name/wg/wgpu-native/examples.nix | 7 +- pkgs/by-name/wi/wiliwili/package.nix | 16 +- pkgs/by-name/wi/winbox4/build-from-zip.nix | 16 +- pkgs/by-name/wi/windterm/package.nix | 19 +- pkgs/by-name/wi/wired/package.nix | 16 +- pkgs/by-name/wk/wkhtmltopdf/package.nix | 7 +- pkgs/by-name/wm/wmutils-opt/package.nix | 4 +- pkgs/by-name/wo/wolf-shaper/package.nix | 4 +- pkgs/by-name/wo/wonderdraft/package.nix | 16 +- pkgs/by-name/wo/wootility/package.nix | 2 +- pkgs/by-name/wo/wox/package.nix | 7 +- pkgs/by-name/wp/wpsoffice-cn/package.nix | 10 +- pkgs/by-name/wp/wpsoffice/package.nix | 10 +- pkgs/by-name/wr/wrangler/package.nix | 4 +- pkgs/by-name/wt/wtk/package.nix | 16 +- pkgs/by-name/wx/wxmacmolplt/package.nix | 6 +- .../x-/x-create-mouse-void/package.nix | 4 +- pkgs/by-name/x1/x11_ssh_askpass/package.nix | 13 +- pkgs/by-name/x1/x11docker/package.nix | 19 +- pkgs/by-name/x1/x11spice/package.nix | 10 +- pkgs/by-name/x1/x11vnc/package.nix | 35 ++-- pkgs/by-name/x2/x2goserver/package.nix | 25 ++- pkgs/by-name/x2/x2vnc/package.nix | 13 +- pkgs/by-name/xa/xapp/package.nix | 4 +- pkgs/by-name/xa/xastir/package.nix | 7 +- pkgs/by-name/xa/xautoclick/package.nix | 4 +- pkgs/by-name/xc/xcircuit/package.nix | 16 +- pkgs/by-name/xc/xcur2png/package.nix | 10 +- pkgs/by-name/xd/xdg-launch/package.nix | 7 +- pkgs/by-name/xd/xdummy/package.nix | 29 ++- pkgs/by-name/xe/xephem/package.nix | 10 +- .../xf/xf86-input-joystick/package.nix | 2 +- pkgs/by-name/xf/xf86-input-void/package.nix | 2 +- pkgs/by-name/xf/xf86-video-suncg6/package.nix | 2 +- pkgs/by-name/xf/xf86-video-sunffb/package.nix | 2 +- pkgs/by-name/xf/xf86-video-sunleo/package.nix | 2 +- pkgs/by-name/xf/xfe/package.nix | 7 +- pkgs/by-name/xi/xidlehook/package.nix | 10 +- pkgs/by-name/xi/xinput-calibrator/package.nix | 10 +- pkgs/by-name/xj/xjadeo/package.nix | 7 +- pkgs/by-name/xl/xlayoutdisplay/package.nix | 10 +- pkgs/by-name/xl/xlife/package.nix | 10 +- pkgs/by-name/xl/xlogo/package.nix | 19 +- pkgs/by-name/xm/xmind/package.nix | 25 ++- pkgs/by-name/xm/xmonad_log_applet/package.nix | 4 +- pkgs/by-name/xm/xmousepasteblock/package.nix | 10 +- pkgs/by-name/xn/xneur/package.nix | 13 +- pkgs/by-name/xo/xob/package.nix | 7 +- pkgs/by-name/xo/xorg_sys_opengl/package.nix | 7 +- pkgs/by-name/xo/xosd-xft/package.nix | 10 +- pkgs/by-name/xp/xplugd/package.nix | 13 +- pkgs/by-name/xp/xpra/package.nix | 39 ++-- pkgs/by-name/xp/xprintidle/package.nix | 10 +- pkgs/by-name/xq/xquartz/package.nix | 189 +++++++++++------- pkgs/by-name/xq/xquartz/system-fonts.nix | 8 +- pkgs/by-name/xr/xrdp/package.nix | 19 +- pkgs/by-name/xr/xrestop/package.nix | 9 +- pkgs/by-name/xs/xscast/package.nix | 10 +- pkgs/by-name/xs/xscope/package.nix | 7 +- pkgs/by-name/xs/xscreenruler/package.nix | 7 +- pkgs/by-name/xs/xscreensaver/package.nix | 4 +- pkgs/by-name/xs/xsnow/package.nix | 13 +- pkgs/by-name/xs/xspim/package.nix | 25 ++- pkgs/by-name/xs/xssproxy/package.nix | 7 +- pkgs/by-name/xt/xteddy/package.nix | 7 +- pkgs/by-name/xt/xterm/package.nix | 28 ++- pkgs/by-name/xt/xtris/package.nix | 4 +- pkgs/by-name/xv/xv/package.nix | 7 +- pkgs/by-name/xw/xwayland-run/package.nix | 6 +- pkgs/by-name/xw/xwinwrap/package.nix | 10 +- pkgs/by-name/yd/ydotool/package.nix | 4 +- pkgs/by-name/yo/yoshimi/package.nix | 4 +- pkgs/by-name/yo/youtube-tui/package.nix | 4 +- pkgs/by-name/yu/yudit/package.nix | 4 +- pkgs/by-name/ze/zed-editor/package.nix | 4 +- pkgs/by-name/ze/zepp-simulator/package.nix | 4 +- pkgs/by-name/zo/zoom-us/package.nix | 30 +-- pkgs/by-name/zo/zoom-us/test.nix | 4 +- pkgs/by-name/zo/zoom/package.nix | 15 +- pkgs/by-name/zo/zotero-beta/package.nix | 31 ++- pkgs/by-name/zo/zotero/linux.nix | 31 ++- pkgs/data/themes/adwaita-qt/default.nix | 4 +- pkgs/desktops/enlightenment/efl/default.nix | 43 ++-- .../gnome-2/platform/gtkglext/default.nix | 7 +- .../gnome/extensions/no-title-bar/default.nix | 7 +- pkgs/desktops/lumina/lumina/default.nix | 16 +- pkgs/desktops/mate/caja/with-extensions.nix | 4 +- .../desktops/mate/mate-panel/with-applets.nix | 4 +- .../apps/switchboard-plugs/wacom/default.nix | 7 +- .../pantheon/apps/switchboard/wrapper.nix | 4 +- .../wingpanel-indicators/keyboard/default.nix | 4 +- .../pantheon/desktop/wingpanel/wrapper.nix | 4 +- .../xdg-desktop-portal-pantheon/default.nix | 4 +- .../compilers/chicken/5/overrides.nix | 4 +- .../flutter/artifacts/fetch-artifacts.nix | 4 +- .../compilers/flutter/engine/package.nix | 37 ++-- .../community-edition/buildGraalvm.nix | 16 +- .../compilers/opensmalltalk-vm/default.nix | 7 +- pkgs/development/compilers/squeak/default.nix | 4 +- .../compilers/temurin-bin/jdk-linux-base.nix | 16 +- pkgs/development/compilers/zulu/common.nix | 19 +- .../cuda-modules/packages/nsight_systems.nix | 13 +- .../embedded/arduino/arduino-core/default.nix | 19 +- .../haskell-modules/configuration-nix.nix | 12 +- .../interpreters/erlang/generic-builder.nix | 4 +- pkgs/development/interpreters/love/0.10.nix | 4 +- pkgs/development/interpreters/love/11.nix | 4 +- .../interpreters/python/conda/default.nix | 24 +-- .../interpreters/python/manylinux/default.nix | 10 +- .../gobject-introspection/wrapper.nix | 4 +- .../libraries/gstreamer/good/default.nix | 16 +- .../libraries/gstreamer/vaapi/default.nix | 22 +- .../libraries/intel-oneapi/base.nix | 39 ++-- .../kdelibs4support/default.nix | 4 +- pkgs/development/libraries/libwnck/2.nix | 7 +- pkgs/development/libraries/mesa/darwin.nix | 13 +- pkgs/development/libraries/mesa/default.nix | 25 ++- .../libraries/pipewire/default.nix | 10 +- .../libraries/qt-5/modules/qtwebengine.nix | 16 +- .../libraries/qt-6/modules/qtbase/default.nix | 10 +- .../qt-6/modules/qtwebengine/default.nix | 19 +- .../libraries/qwlroots/default.nix | 7 +- .../libraries/webkitgtk/default.nix | 4 +- .../development/libraries/wlroots/default.nix | 16 +- pkgs/development/misc/msp430/newlib.nix | 8 +- .../mobile/androidenv/emulator.nix | 30 +-- pkgs/development/mobile/androidenv/extras.nix | 4 +- pkgs/development/mobile/androidenv/tools.nix | 16 +- .../python-modules/dragonfly/default.nix | 4 +- .../python-modules/i3ipc/default.nix | 7 +- .../python-modules/libretranslate/default.nix | 4 +- .../python-modules/mss/default.nix | 10 +- .../python-modules/py3status/default.nix | 7 +- .../python-modules/pybullet/default.nix | 4 +- .../python-modules/pyglet/default.nix | 22 +- .../pyvirtualdisplay/default.nix | 16 +- .../python-modules/xcffib/default.nix | 10 +- .../python-modules/xlib/default.nix | 10 +- .../python-modules/xvfbwrapper/default.nix | 6 +- pkgs/development/r-modules/default.nix | 18 +- .../ruby-modules/gem-config/default.nix | 22 +- .../tcl-modules/by-name/tk/tkimg/package.nix | 4 +- .../tools/electron/binary/generic.nix | 25 ++- .../tools/electron/chromedriver/generic.nix | 4 +- pkgs/development/tools/nwjs/default.nix | 37 ++-- pkgs/development/web/playwright/chromium.nix | 22 +- pkgs/games/fteqw/default.nix | 10 +- pkgs/games/fteqw/generic.nix | 4 +- pkgs/games/openloco/default.nix | 4 +- pkgs/games/ue4demos/default.nix | 7 +- pkgs/kde/frameworks/kidletime/default.nix | 4 +- pkgs/kde/gear/colord-kde/default.nix | 4 +- pkgs/kde/gear/kio-extras/default.nix | 4 +- pkgs/kde/gear/kmousetool/default.nix | 4 +- pkgs/kde/gear/krfb/default.nix | 4 +- pkgs/kde/plasma/kgamma/default.nix | 4 +- pkgs/kde/plasma/kwin-x11/default.nix | 4 +- pkgs/kde/plasma/kwin/default.nix | 4 +- pkgs/kde/plasma/plasma-desktop/default.nix | 16 +- .../kde/plasma/plasma-integration/default.nix | 4 +- pkgs/kde/plasma/plasma-workspace/default.nix | 21 +- .../bsd/freebsd/pkgs/nvidia-libs.nix | 7 +- .../bsd/freebsd/pkgs/xf86-video-scfb.nix | 4 +- pkgs/os-specific/linux/conky/default.nix | 18 +- pkgs/os-specific/linux/lenovo-legion/app.nix | 4 +- pkgs/os-specific/linux/nvidia-x11/generic.nix | 10 +- pkgs/servers/mir/common.nix | 10 +- .../misc/qremotecontrol-server/default.nix | 4 +- pkgs/servers/pulseaudio/default.nix | 16 +- pkgs/shells/nushell/default.nix | 4 +- pkgs/tools/X11/virtualgl/lib.nix | 4 +- pkgs/tools/admin/turbovnc/default.nix | 52 +++-- pkgs/tools/audio/yabridge/default.nix | 2 +- pkgs/tools/graphics/graphviz/default.nix | 4 +- .../ibus-engines/ibus-bamboo/default.nix | 4 +- pkgs/tools/inputmethods/m17n-lib/otf.nix | 4 +- pkgs/tools/misc/antimicrox/default.nix | 4 +- pkgs/tools/misc/xvfb-run/default.nix | 4 +- pkgs/tools/security/keybase/gui.nix | 37 ++-- pkgs/tools/typesetting/tex/texlive/bin.nix | 18 +- pkgs/top-level/all-packages.nix | 10 +- pkgs/top-level/nim-overrides.nix | 10 +- pkgs/top-level/perl-packages.nix | 50 ++--- 718 files changed, 5365 insertions(+), 3588 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index c52ce1413e54..5b70b7a10e89 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -19,7 +19,12 @@ pulseaudio, wrapGAppsHook3, xdg-utils, - xorg, + libxcb-util, + libxcb-wm, + libxtst, + libxcursor, + libx11, + libxcb, zlib, }: @@ -52,16 +57,16 @@ stdenv.mkDerivation rec { libjack2 # libjpeg8 is required for converting jpeg's to colour palettes libjpeg - xorg.libxcb - xorg.libXcursor - xorg.libX11 - xorg.libXtst + libxcb + libxcursor + libx11 + libxtst libxkbcommon pipewire pulseaudio (lib.getLib stdenv.cc.cc) - xorg.xcbutil - xorg.xcbutilwm + libxcb-util + libxcb-wm zlib ]; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index e99f707d0823..44689e616fe0 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -26,7 +26,12 @@ wrapGAppsHook3, xcb-imdkit, xdg-utils, - xorg, + libxcb-util, + libxcb-wm, + libxtst, + libxcursor, + libx11, + libxcb, zlib, }: @@ -64,10 +69,10 @@ stdenv.mkDerivation rec { # libjpeg8 is required for converting jpeg's to colour palettes libjpeg libnghttp2 - xorg.libxcb - xorg.libXcursor - xorg.libX11 - xorg.libXtst + libxcb + libxcursor + libx11 + libxtst libxkbcommon libudev-zero pango @@ -75,8 +80,8 @@ stdenv.mkDerivation rec { (lib.getLib stdenv.cc.cc) vulkan-loader xcb-imdkit - xorg.xcbutil - xorg.xcbutilwm + libxcb-util + libxcb-wm zlib ]; diff --git a/pkgs/applications/audio/open-music-kontrollers/mephisto.nix b/pkgs/applications/audio/open-music-kontrollers/mephisto.nix index 2658a3ca217b..641dce27bdee 100644 --- a/pkgs/applications/audio/open-music-kontrollers/mephisto.nix +++ b/pkgs/applications/audio/open-music-kontrollers/mephisto.nix @@ -13,7 +13,8 @@ lv2, lv2lint, sord, - xorg, + libxext, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -41,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: { libvterm-neovim lv2 sord - xorg.libX11 - xorg.libXext + libx11 + libxext glew lv2lint ]; diff --git a/pkgs/applications/backup/timeshift/wrapper.nix b/pkgs/applications/backup/timeshift/wrapper.nix index 11e27546334b..781741e5984e 100644 --- a/pkgs/applications/backup/timeshift/wrapper.nix +++ b/pkgs/applications/backup/timeshift/wrapper.nix @@ -4,7 +4,7 @@ wrapGAppsHook3, gdk-pixbuf, librsvg, - xorg, + lndir, shared-mime-info, }: @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ wrapGAppsHook3 - xorg.lndir + lndir ]; installPhase = '' diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index a4ac00d73bf3..6526006ec5ef 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -70,7 +70,8 @@ runCommand, wayland, xkeyboard_config, - xorg, + libsm, + libice, zlib, makeDesktopItem, tiling_wm, # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper @@ -175,8 +176,8 @@ let xcbutilkeysyms xcbutilimage xcbutilcursor - xorg.libICE - xorg.libSM + libice + libsm libxkbfile libXcomposite libXcursor diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix index 5fde0c16fbff..44489af09de8 100644 --- a/pkgs/applications/editors/jetbrains/ides/rider.nix +++ b/pkgs/applications/editors/jetbrains/ides/rider.nix @@ -14,7 +14,7 @@ libSM, libX11, dotnetCorePackages, - xorg, + libxcb-keysyms, expat, libxml2, xz, @@ -64,7 +64,7 @@ in musl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.xcbutilkeysyms + libxcb-keysyms ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch) [ expat diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix index 8c3094c302a6..80e53e88874b 100644 --- a/pkgs/applications/editors/jetbrains/source/build.nix +++ b/pkgs/applications/editors/jetbrains/source/build.nix @@ -22,7 +22,7 @@ maven, p7zip, pkg-config, - xorg, + libx11, }: { version, @@ -97,7 +97,7 @@ let ]; buildInputs = [ glib - xorg.libX11 + libx11 libdbusmenu ]; inherit src; diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 44988cbbaad5..16a5bbebef24 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -9,7 +9,7 @@ fetchurl, lib, stdenv, - xorg, + libx11, glib, glibcLocales, gtk3, @@ -47,7 +47,7 @@ let arch = if stdenv.hostPlatform.system == "i686-linux" then "x32" else "x64"; libPath = lib.makeLibraryPath [ - xorg.libX11 + libx11 glib gtk3 cairo diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index 0dfc59a083e9..1db60808f0d9 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -9,7 +9,8 @@ fetchurl, stdenv, lib, - xorg, + libxtst, + libx11, glib, libglvnd, glibcLocales, @@ -49,8 +50,8 @@ let versionFile = toString ./packages.nix; neededLibraries = [ - xorg.libX11 - xorg.libXtst + libx11 + libxtst glib libglvnd openssl_1_1 diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 8744ae65b504..ff4051f7e826 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -48,7 +48,7 @@ xdg-utils, xdotool, xkb-switch, - xorg, + xwininfo, xxd, ycmd, zathura, @@ -3369,7 +3369,7 @@ assertNoAdditions { postPatch = '' substituteInPlace lua/stylish/common/mouse_hover_handler.lua --replace-fail xdotool ${xdotool}/bin/xdotool substituteInPlace lua/stylish/components/menu.lua --replace-fail xdotool ${xdotool}/bin/xdotool - substituteInPlace lua/stylish/components/menu.lua --replace-fail xwininfo ${xorg.xwininfo}/bin/xwininfo + substituteInPlace lua/stylish/components/menu.lua --replace-fail xwininfo ${xwininfo}/bin/xwininfo ''; }; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 36917ed70beb..5b318c759ea6 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -15,7 +15,14 @@ libgbm, nss, nspr, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxkbfile, + libxcb, systemdLibs, fontconfig, imagemagick, @@ -118,13 +125,13 @@ stdenv.mkDerivation ( cups expat libxkbcommon - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libxcb - xorg.libXext - xorg.libXfixes - xorg.libXrandr + libx11 + libxcomposite + libxdamage + libxcb + libxext + libxfixes + libxrandr cairo pango alsa-lib @@ -243,7 +250,7 @@ stdenv.mkDerivation ( nspr systemdLibs webkitgtk_4_1 - xorg.libxkbfile + libxkbfile ]; runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix b/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix index 3fea5eeacdfa..634fdd4ffd95 100644 --- a/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix +++ b/pkgs/applications/emulators/libretro/cores/bsnes-hd.nix @@ -2,7 +2,8 @@ lib, fetchFromGitHub, mkLibretroCore, - xorg, + libxext, + libx11, }: mkLibretroCore { core = "bsnes-hd-beta"; @@ -16,8 +17,8 @@ mkLibretroCore { }; extraBuildInputs = [ - xorg.libX11 - xorg.libXext + libx11 + libxext ]; makefile = "GNUmakefile"; diff --git a/pkgs/applications/emulators/libretro/cores/desmume.nix b/pkgs/applications/emulators/libretro/cores/desmume.nix index bd03cb5bf341..7aa0fc0054cf 100644 --- a/pkgs/applications/emulators/libretro/cores/desmume.nix +++ b/pkgs/applications/emulators/libretro/cores/desmume.nix @@ -6,7 +6,7 @@ libpcap, libGLU, libGL, - xorg, + libx11, }: mkLibretroCore { core = "desmume"; @@ -23,7 +23,7 @@ mkLibretroCore { libpcap libGLU libGL - xorg.libX11 + libx11 ]; makeFlags = diff --git a/pkgs/applications/emulators/libretro/cores/desmume2015.nix b/pkgs/applications/emulators/libretro/cores/desmume2015.nix index d31091595f1e..cb8566a6b511 100644 --- a/pkgs/applications/emulators/libretro/cores/desmume2015.nix +++ b/pkgs/applications/emulators/libretro/cores/desmume2015.nix @@ -6,7 +6,7 @@ libpcap, libGLU, libGL, - xorg, + libx11, }: mkLibretroCore { core = "desmume2015"; @@ -23,7 +23,7 @@ mkLibretroCore { libpcap libGLU libGL - xorg.libX11 + libx11 ]; makeFlags = diff --git a/pkgs/applications/emulators/libretro/cores/dolphin.nix b/pkgs/applications/emulators/libretro/cores/dolphin.nix index ac529309bad7..e4fdc6899c51 100644 --- a/pkgs/applications/emulators/libretro/cores/dolphin.nix +++ b/pkgs/applications/emulators/libretro/cores/dolphin.nix @@ -13,7 +13,16 @@ pkg-config, sfml, udev, - xorg, + libxcb-util, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxext, + libx11, + libsm, + libpthread-stubs, + libxcb, }: mkLibretroCore { core = "dolphin"; @@ -40,16 +49,16 @@ mkLibretroCore { pcre sfml udev - xorg.libSM - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.libXxf86vm - xorg.libpthreadstubs - xorg.libxcb - xorg.xcbutil + libsm + libx11 + libxext + libxi + libxinerama + libxrandr + libxxf86vm + libpthread-stubs + libxcb + libxcb-util ]; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mupen64plus.nix b/pkgs/applications/emulators/libretro/cores/mupen64plus.nix index 2751ae53e473..952cfa55951c 100644 --- a/pkgs/applications/emulators/libretro/cores/mupen64plus.nix +++ b/pkgs/applications/emulators/libretro/cores/mupen64plus.nix @@ -8,7 +8,7 @@ libpng, mkLibretroCore, nasm, - xorg, + libx11, }: mkLibretroCore { core = "mupen64plus-next"; @@ -50,7 +50,7 @@ mkLibretroCore { libGLU libGL libpng - xorg.libX11 + libx11 ]; makefile = "Makefile"; makeFlags = [ diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index f73057a79706..4dbaeac266a9 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -10,7 +10,7 @@ libGLU, mkLibretroCore, openssl, - xorg, + libx11, }: mkLibretroCore { core = "play"; @@ -32,7 +32,7 @@ mkLibretroCore { icu libGL libGLU - xorg.libX11 + libx11 ]; extraNativeBuildInputs = [ cmake ]; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index a931219f2e33..86713fa5941a 100644 --- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix +++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix @@ -9,7 +9,7 @@ pkg-config, python3, snappy, - xorg, + libx11, }: mkLibretroCore { core = "ppsspp"; @@ -33,7 +33,7 @@ mkLibretroCore { libGL libzip snappy - xorg.libX11 + libx11 ]; makefile = "Makefile"; cmakeFlags = [ diff --git a/pkgs/applications/emulators/libretro/cores/same_cdi.nix b/pkgs/applications/emulators/libretro/cores/same_cdi.nix index a92e4390b89e..d0ee91f77bbb 100644 --- a/pkgs/applications/emulators/libretro/cores/same_cdi.nix +++ b/pkgs/applications/emulators/libretro/cores/same_cdi.nix @@ -8,7 +8,7 @@ mkLibretroCore, portaudio, python3, - xorg, + libx11, }: mkLibretroCore { core = "same_cdi"; @@ -45,7 +45,7 @@ mkLibretroCore { libGL libGLU portaudio - xorg.libX11 + libx11 ]; meta = { diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index 06a4ec986b98..2cde881e05ed 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -127,7 +127,7 @@ stdenv.mkDerivation ( ++ lib.optional fontconfigSupport pkgs.fontconfig ++ lib.optional alsaSupport pkgs.alsa-lib ++ lib.optional pulseaudioSupport pkgs.libpulseaudio - ++ lib.optional (xineramaSupport && x11Support) pkgs.xorg.libXinerama + ++ lib.optional (xineramaSupport && x11Support) pkgs.libxinerama ++ lib.optional udevSupport pkgs.udev ++ lib.optional vulkanSupport ( if stdenv.hostPlatform.isDarwin then moltenvk else pkgs.vulkan-loader @@ -165,15 +165,15 @@ stdenv.mkDerivation ( ++ lib.optionals x11Support ( with pkgs; [ - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXxf86vm + libx11 + libxcomposite + libxcursor + libxext + libxfixes + libxi + libxrandr + libxrender + libxxf86vm ] ) ++ lib.optionals waylandSupport ( diff --git a/pkgs/applications/graphics/gimp/2.0/default.nix b/pkgs/applications/graphics/gimp/2.0/default.nix index 2ca48d238443..23d9c0c93b45 100644 --- a/pkgs/applications/graphics/gimp/2.0/default.nix +++ b/pkgs/applications/graphics/gimp/2.0/default.nix @@ -37,7 +37,7 @@ gettext, makeWrapper, gtk-doc, - xorg, + libxpm, glib-networking, libmypaint, gexiv2, @@ -202,7 +202,7 @@ stdenv.mkDerivation (finalAttrs: { libwebp libheif libexif - xorg.libXpm + libxpm glib-networking libmypaint mypaint-brushes1 diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index e93bba704943..ea0d6ef4a0c9 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -49,7 +49,8 @@ perl, appstream, desktop-file-utils, - xorg, + libxpm, + libxmu, glib-networking, json-glib, libmypaint, @@ -188,8 +189,8 @@ stdenv.mkDerivation (finalAttrs: { libheif python libexif - xorg.libXpm - xorg.libXmu + libxpm + libxmu glib-networking libmypaint mypaint-brushes1 diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix index 928e304e7fa0..10a0d0c1d3ef 100644 --- a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitLab, qt6, - xorg, + libxtst, + libx11, cmake, ninja, libcprime, @@ -29,8 +30,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qt6.qtbase - xorg.libXtst - xorg.libX11 + libxtst + libx11 libcprime libcsys ]; diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix index 895e0b7463d1..dfb4d4f4868d 100644 --- a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitLab, kdePackages, - xorg, + libxcomposite, cmake, ninja, libcprime, @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ kdePackages.qtbase kdePackages.kglobalaccel - xorg.libXcomposite + libxcomposite libcprime libcsys ]; diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix index 8cd1042db144..8c42c4bc91b8 100644 --- a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix @@ -11,7 +11,9 @@ wf-recorder, libdbusmenu, playerctl, - xorg, + libxdamage, + xrandr, + xinput, iio-sensor-proxy, inotify-tools, bluez, @@ -58,9 +60,9 @@ stdenv.mkDerivation (finalAttrs: { grim wf-recorder playerctl - xorg.xrandr - xorg.xinput - xorg.libXdamage + xrandr + xinput + libxdamage iio-sensor-proxy inotify-tools bluez diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix index 6bcc95825548..77c41b7093f4 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -17,7 +17,8 @@ pcre, util-linux, wayland, - xorg, + libxtst, + libxdmcp, cmake, doxygen, @@ -49,8 +50,8 @@ mkDerivation { pcre util-linux wayland - xorg.libXdmcp - xorg.libXtst + libxdmcp + libxtst ]; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 84433d5492f4..08f2bf8bc401 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -43,7 +43,8 @@ tinyxml, util-linux, wxGTK32, - xorg, + libxtst, + libxdmcp, xz, }: @@ -119,8 +120,8 @@ stdenv.mkDerivation (finalAttrs: { libselinux libsepol util-linux - xorg.libXdmcp - xorg.libXtst + libxdmcp + libxtst ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 1782a051373e..841e6c459d14 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -19,7 +19,9 @@ icu, freetype, pugixml, - xorg, + libxrandr, + libxinerama, + libxcursor, nix-update-script, }: @@ -79,9 +81,9 @@ stdenv.mkDerivation (finalAttrs: { icu freetype pugixml - xorg.libXrandr - xorg.libXinerama - xorg.libXcursor + libxrandr + libxinerama + libxcursor ]; # Yes, this is PRE configure. The configure phase uses cmake diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 947500522390..830601e189cf 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -30,7 +30,7 @@ qhull, onetbb, wxGTK32, - xorg, + libx11, libbgcode, heatshrink, catch2_3, @@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: { qhull onetbb wxGTK-override' - xorg.libX11 + libx11 libbgcode heatshrink catch2_3 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 681cb813ea00..14f5fbeca252 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -12,7 +12,12 @@ ## various stuff that can be plugged in ffmpeg_7, - xorg, + libxxf86vm, + libxxf86dga, + libxt, + libxscrnsaver, + libxext, + libx11, alsa-lib, libpulseaudio, libcanberra-gtk3, @@ -99,7 +104,7 @@ let libva libgbm libnotify - xorg.libXScrnSaver + libxscrnsaver cups pciutils vulkan-loader @@ -112,11 +117,11 @@ let ++ lib.optional useGlvnd libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) [ stdenv.cc - xorg.libX11 - xorg.libXxf86dga - xorg.libXxf86vm - xorg.libXext - xorg.libXt + libx11 + libxxf86dga + libxxf86vm + libxext + libxt alsa-lib zlib ] diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 56988179d066..ae424918dad6 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -56,19 +56,19 @@ buildFHSEnv { targetPkgs = pkgs: with pkgs; [ - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrender - xorg.libXmu - xorg.libXxf86vm + libice + libsm + libx11 + libxcomposite + libxdamage + libxext + libxfixes + libxrender + libxmu + libxxf86vm libGL - xorg.libxcb - xorg.xkeyboardconfig + libxcb + xkeyboard-config curl dbus firefox-bin @@ -83,8 +83,8 @@ buildFHSEnv { procps zlib libgbm - xorg.libxshmfence - xorg.libpthreadstubs + libxshmfence + libpthread-stubs libappindicator ]; diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix index 04270c82c848..e552f292ef70 100644 --- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -2,7 +2,7 @@ lib, mkFranzDerivation, fetchurl, - xorg, + libxshmfence, stdenv, }: @@ -29,7 +29,7 @@ mkFranzDerivation rec { inherit hash; }; - extraBuildInputs = [ xorg.libxshmfence ]; + extraBuildInputs = [ libxshmfence ]; passthru = { updateScript = ./update.sh; diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index ea0eca43ebab..62462a150b08 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -5,7 +5,17 @@ wrapGAppsHook3, autoPatchelfHook, dpkg, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, atk, glib, pango, @@ -72,17 +82,17 @@ stdenv.mkDerivation ( buildInputs = extraBuildInputs ++ [ - xorg.libXi - xorg.libXcursor - xorg.libXdamage - xorg.libXrandr - xorg.libXcomposite - xorg.libXext - xorg.libXfixes - xorg.libXrender - xorg.libX11 - xorg.libXtst - xorg.libXScrnSaver + libxi + libxcursor + libxdamage + libxrandr + libxcomposite + libxext + libxfixes + libxrender + libx11 + libxtst + libxscrnsaver ] ++ [ libgbm diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 768c5e936de9..550a8ffc07fe 100644 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -13,7 +13,10 @@ desktop-file-utils, imagemagick, twemoji-color-font, - xorg, + xkeyboard-config, + libxscrnsaver, + libxcursor, + libx11, libsodium, libopus, libGL, @@ -52,10 +55,10 @@ mkDerivation rec { qtmultimedia qtwebsockets qtimageformats - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcursor - xorg.xkeyboardconfig + libx11 + libxscrnsaver + libxcursor + xkeyboard-config ]; fontsConf = makeFontsConf { @@ -85,8 +88,8 @@ mkDerivation rec { makeQtWrapper $out/Ripcord $out/bin/ripcord \ --chdir "$out" \ --set FONTCONFIG_FILE "${fontsConf}" \ - --prefix LD_LIBRARY_PATH ":" "${xorg.libXcursor}/lib" \ - --prefix QT_XKB_CONFIG_ROOT ":" "${xorg.xkeyboardconfig}/share/X11/xkb" \ + --prefix LD_LIBRARY_PATH ":" "${libxcursor}/lib" \ + --prefix QT_XKB_CONFIG_ROOT ":" "${xkeyboard-config}/share/X11/xkb" \ --set RIPCORD_ALLOW_UPDATES 0 runHook postInstall diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 87e20c57efab..39a0e28fcbb6 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -8,7 +8,11 @@ "." "netclient" ], - xorg, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, }: buildGoModule rec { @@ -30,11 +34,11 @@ buildGoModule rec { buildInputs = [ libglvnd - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXrandr + libx11 + libxcursor + libxi + libxinerama + libxrandr ]; meta = { diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 2774a4903eae..95650f52160f 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -26,7 +26,7 @@ # Build options enableGTK3 ? false, gtkmm3, - xorg, + libpthread-stubs, wrapGAppsHook3, enableQt5 ? false, enableQt6 ? false, @@ -167,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: { ) ++ optionals enableGTK3 [ gtkmm3 - xorg.libpthreadstubs + libpthread-stubs ] ++ optionals enableSystemd [ systemd ] ++ optionals stdenv.hostPlatform.isLinux [ inotify-tools ]; diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 6a7afab23b3d..8740190ada02 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -65,7 +65,18 @@ tzdata, which, woff2, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxmu, + libxinerama, + libxfixes, + libxext, + libxaw, + libx11, + xprop, + xdpyinfo, + libxcb, zlib, homepage, @@ -199,10 +210,10 @@ stdenv.mkDerivation rec { stdenv.cc.cc (lib.getLib systemd) woff2 - xorg.libXScrnSaver - xorg.libXaw - xorg.libXmu - xorg.libXtst + libxscrnsaver + libxaw + libxmu + libxtst zlib ]; @@ -213,17 +224,17 @@ stdenv.mkDerivation rec { libGL pcsclite - xorg.libX11 - xorg.libXScrnSaver - xorg.libXext - xorg.libXfixes - xorg.libXinerama - xorg.libXmu - xorg.libXrender - xorg.libXtst - xorg.libxcb - xorg.xdpyinfo - xorg.xprop + libx11 + libxscrnsaver + libxext + libxfixes + libxinerama + libxmu + libxrender + libxtst + libxcb + xdpyinfo + xprop ]; installPhase = diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a517dec53f94..6d176db0c832 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -38,7 +38,15 @@ jdk21, ant, cups, - xorg, + libxtst, + libxi, + libxinerama, + libxext, + libxdmcp, + libxaw, + libx11, + libpthread-stubs, + libxshmfence, fontforge, jre21_minimal, openssl, @@ -433,13 +441,13 @@ stdenv.mkDerivation (finalAttrs: { libGL libGLU libtool - xorg.libX11 - xorg.libXaw - xorg.libXdmcp - xorg.libXext - xorg.libXi - xorg.libXinerama - xorg.libXtst + libx11 + libxaw + libxdmcp + libxext + libxi + libxinerama + libxtst libabw libargon2 libatomic_ops @@ -455,7 +463,7 @@ stdenv.mkDerivation (finalAttrs: { libmspack libmwaw libodfgen - xorg.libpthreadstubs + libpthread-stubs librdf_redland librevenge librsvg @@ -466,7 +474,7 @@ stdenv.mkDerivation (finalAttrs: { libwps libxcrypt libxml2 - xorg.libxshmfence + libxshmfence libxslt libzmf libwebp diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index f136b0e8ba99..43ea2802346b 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -4,7 +4,7 @@ # The unwrapped libreoffice derivation unwrapped, makeWrapper, - xorg, # for lndir + lndir, runCommand, # For Emulating wrapGAppsHook3 gsettings-desktop-schemas, @@ -125,7 +125,7 @@ runCommand "${unwrapped.name}-wrapped" paths = [ unwrapped ]; nativeBuildInputs = [ makeWrapper - xorg.lndir + lndir ]; passthru = { inherit unwrapped; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index c123a7b6f692..cabb13b6f0f2 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { # Join all plugins via symlinking lib.pipe extraPackages [ (map (pkg: '' - ${buildPackages.xorg.lndir}/bin/lndir -silent ${pkg} $out + ${buildPackages.lndir}/bin/lndir -silent ${pkg} $out '')) lib.concatStrings ] diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index 885a55334f02..660a191e3cc1 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -10,7 +10,7 @@ pango, lib, stdenv, - xorg, + libx11, }: { @@ -52,7 +52,7 @@ let glib gtk2-x11 pango - xorg.libX11 + libx11 ]; dontBuild = true; diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index b778ec64e230..abbb0ce62309 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -15,7 +15,7 @@ sqlite, unixODBC, gtk2, - xorg, + libxtst, glibcLocales, releasePath ? null, }: @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { gtk2 sqlite unixODBC - xorg.libXtst + libxtst glibcLocales ]; @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { gtk2 gtk3 libsecret - xorg.libXtst + libxtst ]; in '' diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix index 1272c1af05e1..69a276ba762c 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -16,7 +16,18 @@ openssl, unixODBC, xkeyboard_config, - xorg, + libxtst, + libxrender, + libxrandr, + libxmu, + libxi, + libxfixes, + libxext, + libxcursor, + libx11, + libsm, + libice, + libxcb, zlib, libxml2, libuuid, @@ -63,18 +74,18 @@ stdenv.mkDerivation rec { zlib libGL libGLU - xorg.libX11 - xorg.libXext - xorg.libXtst - xorg.libXi - xorg.libXmu - xorg.libXrender - xorg.libxcb - xorg.libXcursor - xorg.libXfixes - xorg.libXrandr - xorg.libICE - xorg.libSM + libx11 + libxext + libxtst + libxi + libxmu + libxrender + libxcb + libxcursor + libxfixes + libxrandr + libice + libsm ]; # some bundled libs are found through LD_LIBRARY_PATH diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index c3e0e5147448..c82b02838e55 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -9,7 +9,7 @@ fetchurl, lib, stdenv, - xorg, + libx11, glib, libGL, glibcLocales, @@ -48,7 +48,7 @@ let versionFile = toString ./default.nix; neededLibraries = [ - xorg.libX11 + libx11 glib gtk3 cairo diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 1a72ebc4eded..ded3569c6fe0 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -26,7 +26,7 @@ x264, curl, wayland, - xorg, + libx11, pkg-config, libvlc, libGL, @@ -215,7 +215,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = let wrapperLibraries = [ - xorg.libX11 + libx11 libvlc libGL ] diff --git a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix index 1c9d80391b65..d9c108090eac 100644 --- a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix +++ b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix @@ -7,7 +7,14 @@ ninja, obs-studio, qtbase, - xorg, + libxt, + libxtst, + libxi, + libxinerama, + libxext, + libxdmcp, + libxau, + libx11, libxkbcommon, libxkbfile, sdl3, @@ -35,14 +42,14 @@ stdenv.mkDerivation (finalAttrs: { obs-studio qtbase sdl3 - xorg.libX11 - xorg.libXau - xorg.libXdmcp - xorg.libXtst - xorg.libXext - xorg.libXi - xorg.libXt - xorg.libXinerama + libx11 + libxau + libxdmcp + libxtst + libxext + libxi + libxt + libxinerama libxkbcommon libxkbfile ]; diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 74c7f2fcf5f8..006b2635f597 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -24,7 +24,18 @@ libgbm, nss, nspr, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, streamlink, }: let @@ -72,18 +83,18 @@ stdenv.mkDerivation rec { nss nspr libuuid - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst + libx11 + libxcb + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxscrnsaver + libxtst makeWrapper wrapGAppsHook3 ]; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 61453be5e0be..dc4c069df341 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -9,7 +9,8 @@ ffmpeg, libva, libvdpau, - xorg, + libx11, + libxcb, libGL, libGLU, }: @@ -31,8 +32,8 @@ stdenv.mkDerivation rec { alsa-lib libva libvdpau - xorg.libxcb - xorg.libX11 + libxcb + libx11 libGL libGLU ]; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index c89b04605fc4..06d245582a38 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -14,7 +14,8 @@ xz, pkg-config, which, - xorg, + xorg-server, + xrandr, yasm, patchelf, makeself, @@ -48,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { which yasm makeself - xorg.xorgserver + xorg-server openssl linuxHeaders xz @@ -89,8 +90,8 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace ./src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDrmClient.cpp --replace-fail /usr/bin/VBoxDRMClient /run/current-system/sw/bin/VBoxDRMClient substituteInPlace ./src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDrmClient.cpp --replace-fail /usr/bin/VBoxClient /run/current-system/sw/bin/VBoxClient - substituteInPlace ./src/VBox/Additions/x11/VBoxClient/display.cpp --replace-fail /usr/X11/bin/xrandr ${xorg.xrandr}/bin/xrandr - substituteInPlace ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk --replace-fail /usr/include/xorg "${xorg.xorgserver.dev}/include/xorg " + substituteInPlace ./src/VBox/Additions/x11/VBoxClient/display.cpp --replace-fail /usr/X11/bin/xrandr ${xrandr}/bin/xrandr + substituteInPlace ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk --replace-fail /usr/include/xorg "${xorg-server.dev}/include/xorg " ''; configurePhase = '' diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 94c4da5f53ef..ac1f1f55eba0 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -5,7 +5,12 @@ lib, dbus, kmod, - xorg, + libxt, + libxrandr, + libxmu, + libxfixes, + libxext, + libxcursor, zlib, patchelf, makeWrapper, @@ -44,11 +49,11 @@ let } { name = "libXfixes.so"; - pkg = xorg.libXfixes; + pkg = libxfixes; } { name = "libXrandr.so"; - pkg = xorg.libXrandr; + pkg = libxrandr; } { name = "libwayland-client.so"; @@ -60,7 +65,7 @@ let } { name = "libXt.so"; - pkg = xorg.libXt; + pkg = libxt; } ]; in @@ -103,12 +108,12 @@ stdenv.mkDerivation { stdenv.cc.cc stdenv.cc.libc zlib - xorg.libX11 - xorg.libXt - xorg.libXext - xorg.libXmu - xorg.libXfixes - xorg.libXcursor + libx11 + libxt + libxext + libxmu + libxfixes + libxcursor ] } $i done diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index d050baa5cbd8..6c477bec07f2 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -10,7 +10,15 @@ imagemagick, pkg-config, gdk-pixbuf, - xorg, + libxcb-util, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxdmcp, + libxau, + libxshmfence, + libxcb, libstartup_notification, libxdg_basedir, libpthreadstubs, @@ -122,15 +130,15 @@ stdenv.mkDerivation rec { net-tools pango xcb-util-cursor - xorg.libXau - xorg.libXdmcp - xorg.libxcb - xorg.libxshmfence - xorg.xcbutil - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm + libxau + libxdmcp + libxcb + libxshmfence + libxcb-util + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-wm libxkbcommon xcbutilxrm ] diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 16cf3b8c1a90..d761e7144297 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -25,7 +25,8 @@ xorgserver, xvfb-run, xdotool, - xorg, + xrandr, + setxkbmap, which, asciidoc, xmlto, @@ -106,8 +107,8 @@ stdenv.mkDerivation (finalAttrs: { xorgserver xvfb-run xdotool - xorg.setxkbmap - xorg.xrandr + setxkbmap + xrandr which ]; diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix index 0512ea66c73c..e1ba87a78404 100644 --- a/pkgs/applications/window-managers/i3/easyfocus.nix +++ b/pkgs/applications/window-managers/i3/easyfocus.nix @@ -6,7 +6,7 @@ xorgproto, libxcb, xcbutilkeysyms, - xorg, + libx11, i3ipc-glib, glib, }: @@ -27,7 +27,7 @@ stdenv.mkDerivation { libxcb xcbutilkeysyms xorgproto - xorg.libX11.dev + libx11.dev i3ipc-glib glib.dev ]; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index bd05c1eb9326..51d3af3ed4b3 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -15,7 +15,7 @@ libxkbfile, libjpeg_turbo, xcbutilxrm, - xorg, + libxcb-util, }: stdenv.mkDerivation rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { libxkbfile libjpeg_turbo xcbutilxrm - xorg.xcbutil + libxcb-util ]; makeFlags = [ "all" ]; diff --git a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix index a1f6ecd82cb7..285ffaeb1212 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libx11, i3lock, }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { hash = "sha256-EoX8ts0yV/zkb4wgEh4P8noU+UraRS4w9pp+76v+Nm0="; }; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; propagatedBuildInputs = [ i3lock ]; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index b082a162e833..de64e19608cf 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -15,7 +15,7 @@ cairo, libxkbcommon, libxkbfile, - xorg, + libxcb-util, }: stdenv.mkDerivation rec { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { cairo libxkbcommon libxkbfile - xorg.xcbutil + libxcb-util ]; meta = { diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index cb7597bba41e..47633170e263 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, rustPlatform, - xorg, + libxcb-keysyms, python3, pkg-config, cairo, @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { cairo expat libxkbcommon - xorg.xcbutilkeysyms + libxcb-keysyms ]; # For now, this is the only available featureset. This is also why the file is diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 7a034b8ea642..79b932157728 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -22,7 +22,7 @@ pango, pkg-config, which, - xorg, + libxrender, xorgproto, gitUpdater, }: @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { libpng librsvg pango - xorg.libXrender + libxrender xorgproto ]; diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index 2ada60594b5e..aa21a197caf5 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -24,7 +24,7 @@ wayland-scanner, wlroots_0_19, pango, - xorg, + libxcb-wm, yyjson, }: let @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 vulkan-headers wayland-protocols - xorg.xcbutilwm + libxcb-wm yyjson ]; diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index fd95aea165d7..2ca83c4fe503 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -119,7 +119,7 @@ rec { gtk3 bashInteractive zenity - xorg.xrandr + xrandr which perl xdg-user-dirs # flutter desktop apps @@ -139,35 +139,35 @@ rec { multiPkgs = pkgs: with pkgs; [ desktop-file-utils - xorg.libXcomposite - xorg.libXtst - xorg.libXrandr - xorg.libXext - xorg.libX11 - xorg.libXfixes + libxcomposite + libxtst + libxrandr + libxext + libx11 + libxfixes libGL gst_all_1.gstreamer gst_all_1.gst-plugins-ugly gst_all_1.gst-plugins-base libdrm - xorg.xkeyboardconfig - xorg.libpciaccess + xkeyboard-config + libpciaccess glib bzip2 zlib gdk-pixbuf - xorg.libXinerama - xorg.libXdamage - xorg.libXcursor - xorg.libXrender - xorg.libXScrnSaver - xorg.libXxf86vm - xorg.libXi - xorg.libSM - xorg.libICE + libxinerama + libxdamage + libxcursor + libxrender + libxscrnsaver + libxxf86vm + libxi + libsm + libice freetype curlWithGnuTls nspr @@ -187,14 +187,14 @@ rec { at-spi2-atk libudev0-shim - xorg.libXt - xorg.libXmu - xorg.libxcb - xorg.xcbutil - xorg.xcbutilwm - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil + libxt + libxmu + libxcb + libxcb-util + libxcb-wm + libxcb-image + libxcb-keysyms + libxcb-render-util libGLU libuuid libogg @@ -228,7 +228,7 @@ rec { libgcrypt libvpx librsvg - xorg.libXft + libxft libvdpau alsa-lib diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index 73d1ccef9574..183f717d6c4b 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -93,7 +93,17 @@ in nss_latest, onnxruntime, pango, - xorg, + libxt, + libxtst, + libxrender, + libxi, + libxft, + libxext, + libxdamage, + libxcursor, + libx11, + xorgproto, + pixman, zip, zlib, pkgsBuildBuild, @@ -576,17 +586,17 @@ buildStdenv.mkDerivation { libwebp nspr pango - xorg.libX11 - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXft - xorg.libXi - xorg.libXrender - xorg.libXt - xorg.libXtst - xorg.pixman - xorg.xorgproto + libx11 + libxcursor + libxdamage + libxext + libxft + libxi + libxrender + libxt + libxtst + pixman + xorgproto zlib (if (lib.versionAtLeast version "144") then nss_latest else nss_esr) ] diff --git a/pkgs/build-support/build-nim-sbom.nix b/pkgs/build-support/build-nim-sbom.nix index 1a13196f24a0..b0595028e111 100644 --- a/pkgs/build-support/build-nim-sbom.nix +++ b/pkgs/build-support/build-nim-sbom.nix @@ -4,7 +4,7 @@ fetchgit, fetchzip, runCommand, - xorg, + lndir, nim, nimOverrides, }: @@ -70,7 +70,7 @@ let "out" "src" ]; - nativeBuildInputs = [ xorg.lndir ]; + nativeBuildInputs = [ lndir ]; } '' cat << EOF >> $out diff --git a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix index bca7163fdeea..857862b54100 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix @@ -4439,7 +4439,7 @@ rec { # recreate a file hierarchy as when running tests with cargo # the source for test data - ${pkgs.xorg.lndir}/bin/lndir ${crate.src} + ${pkgs.lndir}/bin/lndir ${crate.src} # build outputs testRoot=target/debug diff --git a/pkgs/by-name/_0/_010editor/package.nix b/pkgs/by-name/_0/_010editor/package.nix index 7f92612cfd6d..3884de5b4c22 100644 --- a/pkgs/by-name/_0/_010editor/package.nix +++ b/pkgs/by-name/_0/_010editor/package.nix @@ -9,7 +9,7 @@ cups, qt6, undmg, - xorg, + xkeyboard-config, }: stdenv.mkDerivation (finalAttrs: { @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { cups qt6.qtbase qt6.qtwayland - xorg.xkeyboardconfig + xkeyboard-config ]; installPhase = @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { # Wrap binary: clean env, fix XKB lookup makeWrapper $out/opt/010editor $out/bin/010editor \ --unset QT_PLUGIN_PATH \ - --set XKB_CONFIG_ROOT ${xorg.xkeyboardconfig}/share/X11/xkb + --set XKB_CONFIG_ROOT ${xkeyboard-config}/share/X11/xkb # Install icon + desktop entry install -D $out/opt/010_icon_128x128.png $out/share/icons/hicolor/128x128/apps/010.png diff --git a/pkgs/by-name/_1/_1fps/package.nix b/pkgs/by-name/_1/_1fps/package.nix index 90fef1a29cbb..bd2dda9dd807 100644 --- a/pkgs/by-name/_1/_1fps/package.nix +++ b/pkgs/by-name/_1/_1fps/package.nix @@ -2,7 +2,9 @@ lib, fetchFromGitHub, buildGoModule, - xorg, + libxtst, + libxi, + libx11, stdenv, }: buildGoModule rec { @@ -21,9 +23,9 @@ buildGoModule rec { vendorHash = "sha256-29x5Lh++NBAsg2O2Vr6pf9iRuVOvow2R5Iqz6twZGXA="; buildInputs = [ - xorg.libX11 - xorg.libXtst - xorg.libXi + libx11 + libxtst + libxi ]; meta = { diff --git a/pkgs/by-name/ac/activate-linux/package.nix b/pkgs/by-name/ac/activate-linux/package.nix index 00e347c4fb30..e67d3ccda23f 100644 --- a/pkgs/by-name/ac/activate-linux/package.nix +++ b/pkgs/by-name/ac/activate-linux/package.nix @@ -3,7 +3,14 @@ fetchFromGitHub, lib, pkg-config, - xorg, + libxt, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxext, + libx11, + xorgproto, cairo, wayland, wayland-protocols, @@ -31,14 +38,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo - xorg.libX11 - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.libXt - xorg.xorgproto + libx11 + libxext + libxfixes + libxi + libxinerama + libxrandr + libxt + xorgproto wayland wayland-protocols libconfig diff --git a/pkgs/by-name/ai/airgeddon/package.nix b/pkgs/by-name/ai/airgeddon/package.nix index 0059f1a35707..40e0c1791439 100644 --- a/pkgs/by-name/ai/airgeddon/package.nix +++ b/pkgs/by-name/ai/airgeddon/package.nix @@ -17,7 +17,8 @@ tmux, # X11 Front xterm, - xorg, + xset, + xdpyinfo, # what the author calls "Internals" usbutils, wget, @@ -108,8 +109,8 @@ let ] ++ lib.optionals supportX11 [ xterm - xorg.xset - xorg.xdpyinfo + xset + xdpyinfo ]; in stdenv.mkDerivation rec { diff --git a/pkgs/by-name/ai/airtame/package.nix b/pkgs/by-name/ai/airtame/package.nix index a71b5a6f1b6f..edb3f9b2905e 100644 --- a/pkgs/by-name/ai/airtame/package.nix +++ b/pkgs/by-name/ai/airtame/package.nix @@ -23,7 +23,11 @@ libGL, vulkan-loader, curlWithGnuTls, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, lib, libnotify, libappindicator-gtk3, @@ -32,11 +36,11 @@ }: let xorgDeps = [ - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXcomposite - xorg.libXrandr + libxdamage + libxext + libxfixes + libxcomposite + libxrandr ]; deps = [ diff --git a/pkgs/by-name/ai/airwin2rack/package.nix b/pkgs/by-name/ai/airwin2rack/package.nix index bd9db16c3cc5..4437cafb965b 100644 --- a/pkgs/by-name/ai/airwin2rack/package.nix +++ b/pkgs/by-name/ai/airwin2rack/package.nix @@ -8,7 +8,13 @@ cmake, pkg-config, alsa-lib, - xorg, + libxrender, + libxrandr, + libxinerama, + libxext, + libxcursor, + libxcomposite, + libx11, fontconfig, freetype, libjack2, @@ -84,13 +90,13 @@ stdenv.mkDerivation { buildInputs = [ alsa-lib - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXext - xorg.libXinerama - xorg.libXrandr - xorg.libXrender + libx11 + libxcomposite + libxcursor + libxext + libxinerama + libxrandr + libxrender fontconfig libjack2 freetype diff --git a/pkgs/by-name/aj/aja-desktop-software/package.nix b/pkgs/by-name/aj/aja-desktop-software/package.nix index f69404bfe5c3..2d86fbc194bd 100644 --- a/pkgs/by-name/aj/aja-desktop-software/package.nix +++ b/pkgs/by-name/aj/aja-desktop-software/package.nix @@ -79,14 +79,14 @@ buildFHSEnv { glib fontconfig freetype - xorg.libxcb - xorg.libX11 - xorg.xcbutilwm - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.libSM - xorg.libICE + libxcb + libx11 + libxcb-wm + libxcb-image + libxcb-keysyms + libxcb-render-util + libsm + libice libxkbcommon dbus avahi diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index c2fc017a3740..23170d0b56e2 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -17,7 +17,11 @@ fontconfig, freetype, libGL, - xorg, + libxxf86vm, + libxi, + libxcursor, + libx11, + libxcb, libxkbcommon, wayland, xdg-utils, @@ -34,11 +38,11 @@ let ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXxf86vm - xorg.libxcb + libx11 + libxcursor + libxi + libxxf86vm + libxcb libxkbcommon wayland ]; diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix index 627b89b7ce21..68c97b44b237 100644 --- a/pkgs/by-name/al/alfaview/package.nix +++ b/pkgs/by-name/al/alfaview/package.nix @@ -22,7 +22,11 @@ openssl, systemd, xcb-util-cursor, - xorg, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libx11, }: stdenv.mkDerivation rec { @@ -61,11 +65,11 @@ stdenv.mkDerivation rec { stdenv.cc.cc systemd xcb-util-cursor - xorg.libX11 - xorg.xcbutilwm - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil + libx11 + libxcb-wm + libxcb-image + libxcb-keysyms + libxcb-render-util ]; libPath = lib.makeLibraryPath buildInputs; diff --git a/pkgs/by-name/al/alttab/package.nix b/pkgs/by-name/al/alttab/package.nix index 0695c17551de..776fc2cc203a 100644 --- a/pkgs/by-name/al/alttab/package.nix +++ b/pkgs/by-name/al/alttab/package.nix @@ -12,7 +12,14 @@ uthash, which, xnee, - xorg, + libxrender, + libxrandr, + libxpm, + libxmu, + libxft, + libx11, + xprop, + xeyes, python3Packages, }: @@ -40,12 +47,12 @@ stdenv.mkDerivation rec { buildInputs = [ libpng uthash - xorg.libX11 - xorg.libXft - xorg.libXmu - xorg.libXpm - xorg.libXrandr - xorg.libXrender + libx11 + libxft + libxmu + libxpm + libxrandr + libxrender ]; enableParallelBuilding = true; @@ -58,8 +65,8 @@ stdenv.mkDerivation rec { python3Packages.xvfbwrapper which xnee - xorg.xeyes - xorg.xprop + xeyes + xprop ]; meta = { diff --git a/pkgs/by-name/al/alttpr-opentracker/package.nix b/pkgs/by-name/al/alttpr-opentracker/package.nix index 398563c48fd7..377cff32bf46 100644 --- a/pkgs/by-name/al/alttpr-opentracker/package.nix +++ b/pkgs/by-name/al/alttpr-opentracker/package.nix @@ -13,7 +13,10 @@ libunwind, openssl, xinput, - xorg, + libxi, + libx11, + libsm, + libice, }: buildDotnetModule rec { pname = "opentracker"; @@ -52,10 +55,10 @@ buildDotnetModule rec { gtk3 openssl xinput - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXi + libice + libsm + libx11 + libxi ]; autoPatchelfIgnoreMissingDeps = [ diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix index ae84cf33a388..313f2ea1fb07 100644 --- a/pkgs/by-name/am/am2rlauncher/package.nix +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -30,10 +30,10 @@ let multiPkgs = pkgs: with pkgs; [ (lib.getLib stdenv.cc.cc) - xorg.libX11 - xorg.libXext - xorg.libXrandr - xorg.libXxf86vm + libx11 + libxext + libxrandr + libxxf86vm curl libGLU libglvnd diff --git a/pkgs/by-name/am/amoeba/package.nix b/pkgs/by-name/am/amoeba/package.nix index 3b77d67bda29..d90130bc7ee0 100644 --- a/pkgs/by-name/am/amoeba/package.nix +++ b/pkgs/by-name/am/amoeba/package.nix @@ -9,7 +9,7 @@ gtk3, libvorbis, libGLU, - xorg, + libxxf86vm, pkg-config, installShellFiles, }: @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 libvorbis libGLU - xorg.libXxf86vm + libxxf86vm ]; installPhase = '' diff --git a/pkgs/by-name/an/anakron/package.nix b/pkgs/by-name/an/anakron/package.nix index 5cd737856512..6dc0b8e4c45f 100644 --- a/pkgs/by-name/an/anakron/package.nix +++ b/pkgs/by-name/an/anakron/package.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchzip, - xorg, + mkfontscale, }: stdenvNoCC.mkDerivation rec { @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-l4MA3OsMnqPIBWKx3ZO5XnxjE0gnIGyAtsZe2z/9zrw="; }; - nativeBuildInputs = [ xorg.mkfontscale ]; + nativeBuildInputs = [ mkfontscale ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/an/anarch/package.nix b/pkgs/by-name/an/anarch/package.nix index 811fe5e253d9..39d5b9776a45 100644 --- a/pkgs/by-name/an/anarch/package.nix +++ b/pkgs/by-name/an/anarch/package.nix @@ -3,7 +3,12 @@ stdenv, fetchFromGitLab, SDL2, - xorg, + libxscrnsaver, + libxrandr, + libxi, + libxfixes, + libxext, + libxcursor, }: stdenv.mkDerivation (finalAttrs: { @@ -19,12 +24,12 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 - xorg.libXcursor - xorg.libXrandr - xorg.libXfixes - xorg.libXext - xorg.libXi - xorg.libXScrnSaver + libxcursor + libxrandr + libxfixes + libxext + libxi + libxscrnsaver ]; # upstream is an error-prone make/build script diff --git a/pkgs/by-name/an/angle/package.nix b/pkgs/by-name/an/angle/package.nix index 93a02c006fd7..597c7e41ad1f 100644 --- a/pkgs/by-name/an/angle/package.nix +++ b/pkgs/by-name/an/angle/package.nix @@ -9,7 +9,10 @@ python3, symlinkJoin, lib, - xorg, + libxi, + libxext, + libx11, + libxcb, wayland, pciutils, libGL, @@ -71,10 +74,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optionals stdenv.isLinux [ glib - xorg.libxcb.dev - xorg.libX11.dev - xorg.libXext.dev - xorg.libXi + libxcb.dev + libx11.dev + libxext.dev + libxi wayland.dev pciutils libGL diff --git a/pkgs/by-name/an/angr-management/package.nix b/pkgs/by-name/an/angr-management/package.nix index de685658d86f..13d51f51677d 100644 --- a/pkgs/by-name/an/angr-management/package.nix +++ b/pkgs/by-name/an/angr-management/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, python312, - xorg, + libxcb-cursor, }: python312.pkgs.buildPythonApplication rec { @@ -23,7 +23,7 @@ python312.pkgs.buildPythonApplication rec { "qtawesome" ]; - buildInputs = [ xorg.xcbutilcursor ]; + buildInputs = [ libxcb-cursor ]; build-system = with python312.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/an/animatch/package.nix b/pkgs/by-name/an/animatch/package.nix index e85ea5fe0253..1a62ed74dce5 100644 --- a/pkgs/by-name/an/animatch/package.nix +++ b/pkgs/by-name/an/animatch/package.nix @@ -5,7 +5,7 @@ fetchFromGitLab, libGL, stdenv, - xorg, + libx11, }: stdenv.mkDerivation rec { pname = "animatch"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ allegro5 libGL - xorg.libX11 + libx11 ]; cmakeFlags = [ diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix index 1d6e98bc0c2f..532ee5c64ebf 100644 --- a/pkgs/by-name/an/animeko/package.nix +++ b/pkgs/by-name/an/animeko/package.nix @@ -36,7 +36,7 @@ libjpeg8, libkate, librsvg, - xorg, + libxpm, libsForQt5, libupnp, aalib, @@ -174,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: { libjpeg8 libkate librsvg - xorg.libXpm + libxpm libsForQt5.qt5.qtsvg libsForQt5.qt5.qtbase libsForQt5.qt5.qtx11extras diff --git a/pkgs/by-name/an/anki-bin/package.nix b/pkgs/by-name/an/anki-bin/package.nix index d16f39ecd09a..8850e149e682 100644 --- a/pkgs/by-name/an/anki-bin/package.nix +++ b/pkgs/by-name/an/anki-bin/package.nix @@ -93,8 +93,8 @@ let targetPkgs = pkgs: (with pkgs; [ - xorg.libxkbfile - xorg.libxshmfence + libxkbfile + libxshmfence libxcb-cursor krb5 zstd diff --git a/pkgs/by-name/an/anttweakbar/package.nix b/pkgs/by-name/an/anttweakbar/package.nix index 441303c2e37d..14d0c2e8d0e8 100644 --- a/pkgs/by-name/an/anttweakbar/package.nix +++ b/pkgs/by-name/an/anttweakbar/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, unzip, - xorg, + libx11, libGLU, libGL, }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; buildInputs = [ - xorg.libX11 + libx11 libGLU libGL ]; diff --git a/pkgs/by-name/an/anvil-editor/package.nix b/pkgs/by-name/an/anvil-editor/package.nix index 1e63152d690f..380ef06b22b9 100644 --- a/pkgs/by-name/an/anvil-editor/package.nix +++ b/pkgs/by-name/an/anvil-editor/package.nix @@ -11,7 +11,10 @@ libxkbcommon, vulkan-headers, libGL, - xorg, + libxfixes, + libxcursor, + libx11, + libxcb, }: buildGoModule (finalAttrs: { @@ -57,10 +60,10 @@ buildGoModule (finalAttrs: { libxkbcommon vulkan-headers libGL - xorg.libX11 - xorg.libxcb - xorg.libXcursor - xorg.libXfixes + libx11 + libxcb + libxcursor + libxfixes ]; # Got different result in utf8 char length? diff --git a/pkgs/by-name/an/anydesk/package.nix b/pkgs/by-name/an/anydesk/package.nix index f768306a6d94..2cdf36d623b1 100644 --- a/pkgs/by-name/an/anydesk/package.nix +++ b/pkgs/by-name/an/anydesk/package.nix @@ -17,7 +17,20 @@ libGLU, libGL, pango, - xorg, + libxt, + libxtst, + libxrender, + libxrandr, + libxmu, + libxi, + libxfixes, + libxext, + libxdamage, + libx11, + libsm, + libice, + libxkbfile, + libxcb, minizip, lsb-release, freetype, @@ -63,20 +76,20 @@ stdenv.mkDerivation (finalAttrs: { polkit polkit_gnome pulseaudio - xorg.libxcb - xorg.libxkbfile - xorg.libX11 - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXmu - xorg.libXrandr - xorg.libXtst - xorg.libXt - xorg.libICE - xorg.libSM - xorg.libXrender + libxcb + libxkbfile + libx11 + libxdamage + libxext + libxfixes + libxi + libxmu + libxrandr + libxtst + libxt + libice + libsm + libxrender ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ap/appgate-sdp/package.nix b/pkgs/by-name/ap/appgate-sdp/package.nix index f9e5666bad4b..baf8eca6ddf2 100644 --- a/pkgs/by-name/ap/appgate-sdp/package.nix +++ b/pkgs/by-name/ap/appgate-sdp/package.nix @@ -36,7 +36,19 @@ stdenv, systemd, xdg-utils, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxshmfence, + libxkbfile, zlib, }: @@ -69,19 +81,19 @@ let pango stdenv.cc.cc systemd - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxkbfile - xorg.libxshmfence + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxkbfile + libxshmfence zlib ]; in diff --git a/pkgs/by-name/ar/ardour/package.nix b/pkgs/by-name/ar/ardour/package.nix index 393986b7cb87..e21a47802dcd 100644 --- a/pkgs/by-name/ar/ardour/package.nix +++ b/pkgs/by-name/ar/ardour/package.nix @@ -59,7 +59,8 @@ vamp-plugin-sdk, wafHook, xjadeo, - xorg, + libxrandr, + libxinerama, optimize ? true, # disable to print Lua DSP script output to stdout videoSupport ? true, }: @@ -164,8 +165,8 @@ stdenv.mkDerivation ( suil taglib vamp-plugin-sdk - xorg.libXinerama - xorg.libXrandr + libxinerama + libxrandr ] ++ lib.optionals videoSupport [ harvid diff --git a/pkgs/by-name/as/astrolog/package.nix b/pkgs/by-name/as/astrolog/package.nix index cfd8af5027d3..6dfa4b421878 100644 --- a/pkgs/by-name/as/astrolog/package.nix +++ b/pkgs/by-name/as/astrolog/package.nix @@ -3,7 +3,7 @@ stdenv, fetchzip, fetchurl, - xorg, + libx11, withBigAtlas ? true, withEphemeris ? true, withMoonsEphemeris ? true, @@ -23,7 +23,7 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace cc "$CC" --replace strip "$STRIP" ''; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; env.NIX_CFLAGS_COMPILE = "-Wno-format-security"; installPhase = diff --git a/pkgs/by-name/as/astromenace/package.nix b/pkgs/by-name/as/astromenace/package.nix index 87a490d46371..38960e4bc225 100644 --- a/pkgs/by-name/as/astromenace/package.nix +++ b/pkgs/by-name/as/astromenace/package.nix @@ -6,7 +6,9 @@ cmake, ninja, makeWrapper, - xorg, + libxinerama, + libx11, + libice, libGLU, libGL, SDL2, @@ -50,9 +52,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xorg.libICE - xorg.libX11 - xorg.libXinerama + libice + libx11 + libxinerama libGLU libGL SDL2 diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 2ec41ca791d2..9938e461bc58 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -16,7 +16,9 @@ libglvnd, libpulseaudio, udev, - xorg, + libxxf86vm, + libxcursor, + libx11, }: let # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." @@ -63,9 +65,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { libglvnd libpulseaudio udev - xorg.libX11 - xorg.libXcursor - xorg.libXxf86vm + libx11 + libxcursor + libxxf86vm ] ++ lib.optional gamemodeSupport gamemode.lib ++ lib.optional textToSpeechSupport flite diff --git a/pkgs/by-name/av/avocode/package.nix b/pkgs/by-name/av/avocode/package.nix index 446e679ddf47..6845d24ac124 100644 --- a/pkgs/by-name/av/avocode/package.nix +++ b/pkgs/by-name/av/avocode/package.nix @@ -21,7 +21,19 @@ expat, udev, adwaita-icon-theme, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxshmfence, + libxcb, mozjpeg, makeWrapper, wrapGAppsHook3, @@ -60,20 +72,20 @@ stdenv.mkDerivation rec { cups expat udev - xorg.libX11 - xorg.libxcb - xorg.libxshmfence + libx11 + libxcb + libxshmfence libxkbcommon - xorg.libXi - xorg.libXcursor - xorg.libXdamage - xorg.libXrandr - xorg.libXcomposite - xorg.libXext - xorg.libXfixes - xorg.libXrender - xorg.libXtst - xorg.libXScrnSaver + libxi + libxcursor + libxdamage + libxrandr + libxcomposite + libxext + libxfixes + libxrender + libxtst + libxscrnsaver libuuid libdrm libgbm diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index a027fe75761b..72e180febd7a 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -31,7 +31,9 @@ stdenv, vulkan-headers, xbyak, - xorg, + libxext, + libx11, + libxcb, enableQtTranslations ? true, qt6, gtk3, @@ -112,9 +114,9 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals stdenv.hostPlatform.isLinux [ pipewire qt6.qtwayland - xorg.libX11 - xorg.libxcb - xorg.libXext + libx11 + libxcb + libxext ] ++ optionals stdenv.hostPlatform.isDarwin [ moltenvk diff --git a/pkgs/by-name/az/azuredatastudio/package.nix b/pkgs/by-name/az/azuredatastudio/package.nix index 6b117f205b5c..39ba55d10e8c 100644 --- a/pkgs/by-name/az/azuredatastudio/package.nix +++ b/pkgs/by-name/az/azuredatastudio/package.nix @@ -29,7 +29,15 @@ pango, systemd, wrapGAppsHook3, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxshmfence, + libxkbfile, + libxcb, zlib, }: @@ -164,16 +172,16 @@ stdenv.mkDerivation rec { nss nspr libdrm - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxshmfence + libx11 + libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxshmfence libxkbcommon - xorg.libxkbfile + libxkbfile pango stdenv.cc.cc systemd diff --git a/pkgs/by-name/ba/badlion-client/package.nix b/pkgs/by-name/ba/badlion-client/package.nix index ebf0608ffc83..adc6ad57e857 100644 --- a/pkgs/by-name/ba/badlion-client/package.nix +++ b/pkgs/by-name/ba/badlion-client/package.nix @@ -30,7 +30,7 @@ appimageTools.wrapAppImage rec { --set APPIMAGE 1 ''; - extraPkgs = pkgs: [ pkgs.xorg.libxshmfence ]; + extraPkgs = pkgs: [ pkgs.libxshmfence ]; meta = { description = "Most Complete All-In-One Mod Library for Minecraft with 100+ Mods, FPS Improvements, and more"; diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix index 2430aa67752a..982a8259d7f7 100644 --- a/pkgs/by-name/ba/bambu-studio/package.nix +++ b/pkgs/by-name/ba/bambu-studio/package.nix @@ -38,7 +38,7 @@ onetbb, webkitgtk_4_1, wxGTK31, - xorg, + libx11, withSystemd ? stdenv.hostPlatform.isLinux, }: let @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { onetbb webkitgtk_4_1 wxGTK' - xorg.libX11 + libx11 opencv ] ++ lib.optionals withSystemd [ systemd ] diff --git a/pkgs/by-name/ba/basalt-monado/package.nix b/pkgs/by-name/ba/basalt-monado/package.nix index 12ff1f3905da..ba56ce00a1d8 100644 --- a/pkgs/by-name/ba/basalt-monado/package.nix +++ b/pkgs/by-name/ba/basalt-monado/package.nix @@ -21,7 +21,7 @@ pkg-config, stdenv, onetbb, - xorg, + libx11, cudaPackages, enableCuda ? config.cudaSupport, }: @@ -63,7 +63,7 @@ stdenv.mkDerivation { magic-enum opencv'.cxxdev onetbb - xorg.libX11 + libx11 ] ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc diff --git a/pkgs/by-name/ba/bashrun2/package.nix b/pkgs/by-name/ba/bashrun2/package.nix index 057d1e3894a4..6323618c0d26 100644 --- a/pkgs/by-name/ba/bashrun2/package.nix +++ b/pkgs/by-name/ba/bashrun2/package.nix @@ -3,7 +3,7 @@ lib, stdenv, makeWrapper, - xorg, + libx11, ncurses, coreutils, bashInteractive, @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xorg.libX11 + libx11 ]; patches = [ diff --git a/pkgs/by-name/bb/bb/package.nix b/pkgs/by-name/bb/bb/package.nix index dfc4fecf42a8..2041e2bbe59b 100644 --- a/pkgs/by-name/bb/bb/package.nix +++ b/pkgs/by-name/bb/bb/package.nix @@ -5,7 +5,9 @@ autoreconfHook, aalib, ncurses, - xorg, + libxdmcp, + libxau, + libx11, libmikmod, }: @@ -29,9 +31,9 @@ stdenv.mkDerivation rec { aalib ncurses libmikmod - xorg.libXau - xorg.libXdmcp - xorg.libX11 + libxau + libxdmcp + libx11 ]; # regparm attribute is not supported by clang diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index 89e129e59f3b..f55378b207d0 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -20,7 +20,13 @@ gdk-pixbuf, nss, nspr, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxcb, alsa-lib, expat, libxkbcommon, @@ -65,13 +71,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib stdenv.cc.cc) - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxcb + libx11 + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxcb libxkbcommon glibc gcc diff --git a/pkgs/by-name/be/bemenu/package.nix b/pkgs/by-name/be/bemenu/package.nix index da29bc3e1ae8..37d749a086a7 100644 --- a/pkgs/by-name/be/bemenu/package.nix +++ b/pkgs/by-name/be/bemenu/package.nix @@ -17,7 +17,12 @@ wayland-protocols, wayland-scanner, x11Support ? stdenv.hostPlatform.isLinux, - xorg, + libxinerama, + libxft, + libxdmcp, + libx11, + libpthread-stubs, + libxcb, }: stdenv.mkDerivation (finalAttrs: { @@ -56,12 +61,12 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols ] ++ lib.optionals x11Support [ - xorg.libX11 - xorg.libXinerama - xorg.libXft - xorg.libXdmcp - xorg.libpthreadstubs - xorg.libxcb + libx11 + libxinerama + libxft + libxdmcp + libpthread-stubs + libxcb ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/be/bepass/package.nix b/pkgs/by-name/be/bepass/package.nix index bdd19c2a9a1d..c575769443fd 100644 --- a/pkgs/by-name/be/bepass/package.nix +++ b/pkgs/by-name/be/bepass/package.nix @@ -5,7 +5,7 @@ enableGUI ? false, # upstream working in progress pkg-config, glfw, - xorg, + libxft, libXcursor, libXrandr, libXinerama, @@ -33,7 +33,7 @@ buildGoModule rec { nativeBuildInputs = lib.optionals enableGUI [ pkg-config ]; buildInputs = lib.optionals enableGUI [ glfw - xorg.libXft + libxft libXcursor libXrandr libXinerama diff --git a/pkgs/by-name/be/betterlockscreen/package.nix b/pkgs/by-name/be/betterlockscreen/package.nix index 13d9998fdbb4..c1e5b1bbcf0f 100644 --- a/pkgs/by-name/be/betterlockscreen/package.nix +++ b/pkgs/by-name/be/betterlockscreen/package.nix @@ -16,7 +16,9 @@ gnused, imagemagick, procps, - xorg, + xset, + xrandr, + xdpyinfo, }: let @@ -30,9 +32,9 @@ let gnused imagemagick procps - xorg.xdpyinfo - xorg.xrandr - xorg.xset + xdpyinfo + xrandr + xset ] ++ lib.optionals withDunst [ dunst ]; in diff --git a/pkgs/by-name/bi/binocle/package.nix b/pkgs/by-name/bi/binocle/package.nix index 3b71bcbc900c..ad58b3e93909 100644 --- a/pkgs/by-name/bi/binocle/package.nix +++ b/pkgs/by-name/bi/binocle/package.nix @@ -4,7 +4,10 @@ rustPlatform, fetchFromGitHub, makeWrapper, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, vulkan-loader, }: @@ -29,10 +32,10 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/binocle \ --suffix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr vulkan-loader ] } diff --git a/pkgs/by-name/bi/bitwig-studio3/package.nix b/pkgs/by-name/bi/bitwig-studio3/package.nix index c503ea929044..cd811e1cf615 100644 --- a/pkgs/by-name/bi/bitwig-studio3/package.nix +++ b/pkgs/by-name/bi/bitwig-studio3/package.nix @@ -9,7 +9,12 @@ glib, gtk3, lib, - xorg, + libxcb-util, + libxcb-wm, + libxtst, + libxcursor, + libx11, + libxcb, libglvnd, libjack2, ffmpeg, @@ -46,17 +51,17 @@ stdenv.mkDerivation (finalAttrs: { gdk-pixbuf glib gtk3 - xorg.libxcb - xorg.xcbutil - xorg.xcbutilwm + libxcb + libxcb-util + libxcb-wm zlib - xorg.libXtst + libxtst libxkbcommon pulseaudio libjack2 - xorg.libX11 + libx11 libglvnd - xorg.libXcursor + libxcursor (lib.getLib stdenv.cc.cc) ]; diff --git a/pkgs/by-name/bl/bloodhound/package.nix b/pkgs/by-name/bl/bloodhound/package.nix index b5ee9459595a..e9bac8137221 100644 --- a/pkgs/by-name/bl/bloodhound/package.nix +++ b/pkgs/by-name/bl/bloodhound/package.nix @@ -33,7 +33,18 @@ udev, unzip, xdg-utils, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxkbfile, }: stdenv.mkDerivation (finalAttrs: { pname = "bloodhound"; @@ -73,19 +84,19 @@ stdenv.mkDerivation (finalAttrs: { systemd (lib.getLib stdenv.cc.cc) udev - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxkbfile - xorg.libxshmfence + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxkbfile + libxshmfence ]; buildInputs = [ diff --git a/pkgs/by-name/bl/bluespec/package.nix b/pkgs/by-name/bl/bluespec/package.nix index c5eeb8e962d9..fc9591d9ecfd 100644 --- a/pkgs/by-name/bl/bluespec/package.nix +++ b/pkgs/by-name/bl/bluespec/package.nix @@ -13,7 +13,7 @@ pkg-config, tcl, tk, - xorg, + libxft, yices, # bsc uses a patched version of yices zlib, ghc, @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { tcl tk which - xorg.libXft + libxft zlib ]; diff --git a/pkgs/by-name/bo/boilr/package.nix b/pkgs/by-name/bo/boilr/package.nix index e7f7b13656dc..9708c601a424 100644 --- a/pkgs/by-name/bo/boilr/package.nix +++ b/pkgs/by-name/bo/boilr/package.nix @@ -5,7 +5,11 @@ rustPlatform, clangStdenv, gtk3, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, + libxcb, perl, pkg-config, openssl, @@ -26,11 +30,11 @@ let wayland # WINIT_UNIX_BACKEND=x11 - xorg.libXcursor - xorg.libXrandr - xorg.libXi - xorg.libX11 - xorg.libxcb + libxcursor + libxrandr + libxi + libx11 + libxcb ]; in rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix index 04678bd953db..8de0713bdda1 100644 --- a/pkgs/by-name/bo/bolt-launcher/package.nix +++ b/pkgs/by-name/bo/bolt-launcher/package.nix @@ -9,7 +9,12 @@ libz, cef-binary, luajit, - xorg, + libxxf86vm, + libxi, + libxext, + libx11, + libsm, + libxcb, libgbm, glib, jdk17, @@ -58,8 +63,8 @@ let buildInputs = [ libgbm - xorg.libX11 - xorg.libxcb + libx11 + libxcb libarchive libz cef @@ -110,11 +115,11 @@ buildFHSEnv { pkgs: [ bolt ] ++ (with pkgs; [ - xorg.libSM - xorg.libXxf86vm - xorg.libX11 - xorg.libXi - xorg.libXext + libsm + libxxf86vm + libx11 + libxi + libxext glib pango cairo diff --git a/pkgs/by-name/bo/boops/package.nix b/pkgs/by-name/bo/boops/package.nix index e3e3908479ff..a29cef3ff332 100644 --- a/pkgs/by-name/bo/boops/package.nix +++ b/pkgs/by-name/bo/boops/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitHub, - xorg, + libx11, cairo, lv2, libsndfile, @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 cairo lv2 libsndfile diff --git a/pkgs/by-name/bo/bottles/package.nix b/pkgs/by-name/bo/bottles/package.nix index 3778eab0bcc1..914cc4beb877 100644 --- a/pkgs/by-name/bo/bottles/package.nix +++ b/pkgs/by-name/bo/bottles/package.nix @@ -28,22 +28,22 @@ let let xorgDeps = pkgs: with pkgs; [ - xorg.libpthreadstubs - xorg.libSM - xorg.libX11 - xorg.libXaw - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdmcp - xorg.libXext - xorg.libXi - xorg.libXinerama - xorg.libXmu - xorg.libXrandr - xorg.libXrender - xorg.libXv - xorg.libXxf86vm + libpthread-stubs + libsm + libx11 + libxaw + libxcb + libxcomposite + libxcursor + libxdmcp + libxext + libxi + libxinerama + libxmu + libxrandr + libxrender + libxv + libxxf86vm ]; gstreamerDeps = pkgs: with pkgs.gst_all_1; [ diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix index 85ff58f20b58..3d61baca34d6 100644 --- a/pkgs/by-name/br/brave/make-brave.nix +++ b/pkgs/by-name/br/brave/make-brave.nix @@ -47,7 +47,7 @@ wayland, xdg-utils, coreutils, - xorg, + libxcb, zlib, # Darwin dependencies @@ -132,7 +132,7 @@ let pipewire udev wayland - xorg.libxcb + libxcb zlib snappy libkrb5 diff --git a/pkgs/by-name/bs/bsequencer/package.nix b/pkgs/by-name/bs/bsequencer/package.nix index 10deec5009b1..f5a8553c33dd 100644 --- a/pkgs/by-name/bs/bsequencer/package.nix +++ b/pkgs/by-name/bs/bsequencer/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libx11, cairo, lv2, pkg-config, @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 cairo lv2 ]; diff --git a/pkgs/by-name/bs/bshapr/package.nix b/pkgs/by-name/bs/bshapr/package.nix index 18656405e55a..52852ccbee24 100644 --- a/pkgs/by-name/bs/bshapr/package.nix +++ b/pkgs/by-name/bs/bshapr/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libx11, cairo, lv2, pkg-config, @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 cairo lv2 ]; diff --git a/pkgs/by-name/bs/bslizr/package.nix b/pkgs/by-name/bs/bslizr/package.nix index ec102ea1b281..e5a18432a19b 100644 --- a/pkgs/by-name/bs/bslizr/package.nix +++ b/pkgs/by-name/bs/bslizr/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libx11, cairo, lv2, pkg-config, @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 cairo lv2 ]; diff --git a/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix b/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix index 05e1e2eebf26..48ccec922720 100644 --- a/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix +++ b/pkgs/by-name/bu/budgie-desktop-with-plugins/package.nix @@ -3,7 +3,7 @@ stdenv, glib, gobject-introspection, - xorg, + lndir, wrapGAppsHook3, budgie-desktop, plugins ? [ ], @@ -37,7 +37,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out for i in $(cat $pathsPath); do - ${xorg.lndir}/bin/lndir -silent $i $out + ${lndir}/bin/lndir -silent $i $out done ''; diff --git a/pkgs/by-name/bu/budgie-screensaver/package.nix b/pkgs/by-name/bu/budgie-screensaver/package.nix index 355e811a2b85..59c6b9dbbe44 100644 --- a/pkgs/by-name/bu/budgie-screensaver/package.nix +++ b/pkgs/by-name/bu/budgie-screensaver/package.nix @@ -17,7 +17,7 @@ systemd, testers, wrapGAppsHook3, - xorg, + libxxf86vm, }: stdenv.mkDerivation (finalAttrs: { @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { libX11 linux-pam systemd - xorg.libXxf86vm + libxxf86vm ]; # Fix GCC 14 build. diff --git a/pkgs/by-name/bu/budgie-session/package.nix b/pkgs/by-name/bu/budgie-session/package.nix index 93889789d360..307d6febde4a 100644 --- a/pkgs/by-name/bu/budgie-session/package.nix +++ b/pkgs/by-name/bu/budgie-session/package.nix @@ -24,7 +24,7 @@ makeWrapper, nix-update-script, systemd, - xorg, + xtrans, libepoxy, bash, }: @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { libICE gnome-desktop json-glib - xorg.xtrans + xtrans adwaita-icon-theme gnome-settings-daemon gsettings-desktop-schemas diff --git a/pkgs/by-name/bu/bumblebee-status/plugins.nix b/pkgs/by-name/bu/bumblebee-status/plugins.nix index 10cb5a565772..58ca8ddb2899 100644 --- a/pkgs/by-name/bu/bumblebee-status/plugins.nix +++ b/pkgs/by-name/bu/bumblebee-status/plugins.nix @@ -15,7 +15,7 @@ in arandr.propagatedBuildInputs = [ py.tkinter pkgs.arandr - pkgs.xorg.xrandr + pkgs.xrandr ]; # checkupdates is unpackaged # arch-update.propagatedBuildInputs = [checkupdates]; @@ -43,7 +43,7 @@ in caffeine.propagatedBuildInputs = [ pkgs.xdg-utils pkgs.xdotool - pkgs.xorg.xprop + pkgs.xprop pkgs.libnotify ]; cmus.propagatedBuildInputs = [ pkgs.cmus ]; @@ -96,24 +96,24 @@ in hddtemp = { }; hostname = { }; http_status = { }; - indicator.propagatedBuildInputs = [ pkgs.xorg.xset ]; + indicator.propagatedBuildInputs = [ pkgs.xset ]; kernel = { }; keys = { }; # python3Packages.xkbgroup is unpackaged layout = { - buildInputs = [ pkgs.xorg.libX11 ]; + buildInputs = [ pkgs.libx11 ]; # propagatedBuildInputs = [py.xkbgroup]; }; # python3Packages.xkbgroup is unpackaged layout-xkb = { - buildInputs = [ pkgs.xorg.libX11 ]; + buildInputs = [ pkgs.libx11 ]; # propagatedBuildInputs = [py.xkbgroup]; }; layout-xkbswitch.propagatedBuildInputs = [ pkgs.xkb-switch ]; # python3Packages.xkbgroup is unpackaged # NOTE: Yes, there is also a plugin named `layout-xkb` with a dash. layout_xkb = { - buildInputs = [ pkgs.xorg.libX11 ]; + buildInputs = [ pkgs.libx11 ]; # propagatedBuildInputs = [python3Packages.xkbgroup]; }; # NOTE: Yes, there is also a plugin named `layout-xkbswitch` with a dash. @@ -162,7 +162,7 @@ in redshift.propagatedBuildInputs = [ pkgs.redshift ]; # rofication is unpackaged # rofication.propagatedBuildInputs = [rofication]; - rotation.propagatedBuildInputs = [ pkgs.xorg.xrandr ]; + rotation.propagatedBuildInputs = [ pkgs.xrandr ]; rss = { }; sensors.propagatedBuildInputs = [ pkgs.lm_sensors ]; sensors2.propagatedBuildInputs = [ pkgs.lm_sensors ]; @@ -205,7 +205,7 @@ in weather.propagatedBuildInputs = [ py.requests ]; xkcd = { }; # i3 is optional - xrandr.propagatedBuildInputs = [ pkgs.xorg.xrandr ]; + xrandr.propagatedBuildInputs = [ pkgs.xrandr ]; yubikey.propagatedBuildInputs = [ pkgs.yubico ]; zpool = { }; } diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index b2c1f16def59..7a83807f950b 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -76,13 +76,13 @@ buildFHSEnv { nspr nss pango - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr + libx11 + libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr ]; extraInstallCommands = '' diff --git a/pkgs/by-name/by/byzanz/package.nix b/pkgs/by-name/by/byzanz/package.nix index 9c4ac245201b..a40f53ee2e59 100644 --- a/pkgs/by-name/by/byzanz/package.nix +++ b/pkgs/by-name/by/byzanz/package.nix @@ -13,7 +13,8 @@ libtool, pkg-config, which, - xorg, + libxdamage, + xwininfo, }: stdenv.mkDerivation { @@ -57,8 +58,8 @@ stdenv.mkDerivation { libtool cairo gtk3 - xorg.xwininfo - xorg.libXdamage + xwininfo + libxdamage ] ++ (with gst_all_1; [ gstreamer diff --git a/pkgs/by-name/ca/caprine-bin/build-from-appimage.nix b/pkgs/by-name/ca/caprine-bin/build-from-appimage.nix index 51307ae91d12..bb04e0b7cc69 100644 --- a/pkgs/by-name/ca/caprine-bin/build-from-appimage.nix +++ b/pkgs/by-name/ca/caprine-bin/build-from-appimage.nix @@ -1,7 +1,7 @@ { fetchurl, appimageTools, - xorg, + lndir, pname, version, sha256, @@ -29,7 +29,7 @@ in extraInstallCommands = '' mkdir -p $out/share - "${xorg.lndir}/bin/lndir" -silent "${extracted}/usr/share" "$out/share" + "${lndir}/bin/lndir" -silent "${extracted}/usr/share" "$out/share" ln -s ${extracted}/caprine.png $out/share/icons/caprine.png mkdir $out/share/applications cp ${extracted}/caprine.desktop $out/share/applications/ diff --git a/pkgs/by-name/ca/cargo-ui/package.nix b/pkgs/by-name/ca/cargo-ui/package.nix index 8ec65814ae99..35f2618f79e1 100644 --- a/pkgs/by-name/ca/cargo-ui/package.nix +++ b/pkgs/by-name/ca/cargo-ui/package.nix @@ -9,7 +9,11 @@ expat, fontconfig, libGL, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, + libxcb, }: rustPlatform.buildRustPackage rec { @@ -35,11 +39,11 @@ rustPlatform.buildRustPackage rec { expat fontconfig libGL - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr - xorg.libxcb + libx11 + libxcursor + libxi + libxrandr + libxcb ]; postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/ca/catclock/package.nix b/pkgs/by-name/ca/catclock/package.nix index 1cd93052c864..e42e8bc6da01 100644 --- a/pkgs/by-name/ca/catclock/package.nix +++ b/pkgs/by-name/ca/catclock/package.nix @@ -3,7 +3,9 @@ lib, fetchFromGitHub, motif, - xorg, + libxt, + libxext, + libx11, withAudioTracking ? false, libpulseaudio, aubio, @@ -34,9 +36,9 @@ stdenv.mkDerivation { buildInputs = [ motif - xorg.libX11 - xorg.libXext - xorg.libXt + libx11 + libxext + libxt ] ++ lib.optionals withAudioTracking [ libpulseaudio diff --git a/pkgs/by-name/ce/cef-binary/package.nix b/pkgs/by-name/ce/cef-binary/package.nix index 167881be91a9..4a0872d16a22 100644 --- a/pkgs/by-name/ce/cef-binary/package.nix +++ b/pkgs/by-name/ce/cef-binary/package.nix @@ -21,7 +21,14 @@ libGL, udev, systemdLibs, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxshmfence, + libxcb, version ? "142.0.10", gitRevision ? "29548e2", chromiumVersion ? "142.0.7444.135", @@ -55,14 +62,14 @@ let libGL udev systemdLibs - xorg.libxcb - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxshmfence + libxcb + libx11 + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxshmfence ]; selectSystem = diff --git a/pkgs/by-name/ce/celeste64/package.nix b/pkgs/by-name/ce/celeste64/package.nix index 2fb6ec64b711..fbb8d0849c61 100644 --- a/pkgs/by-name/ce/celeste64/package.nix +++ b/pkgs/by-name/ce/celeste64/package.nix @@ -12,7 +12,12 @@ libselinux, wayland, libdecor, - xorg, + libxrandr, + libxi, + libxfixes, + libxext, + libxcursor, + libx11, libxkbcommon, libdrm, withSELinux ? false, @@ -44,12 +49,12 @@ buildDotnetModule rec { wayland libdrm libxkbcommon - xorg.libX11 - xorg.libXfixes - xorg.libXext - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxfixes + libxext + libxcursor + libxi + libxrandr ] ++ lib.optionals withSELinux [ libselinux ]; diff --git a/pkgs/by-name/ce/celestegame/package.nix b/pkgs/by-name/ce/celestegame/package.nix index 9f0f38087dea..e0f629748379 100644 --- a/pkgs/by-name/ce/celestegame/package.nix +++ b/pkgs/by-name/ce/celestegame/package.nix @@ -132,20 +132,20 @@ buildFHSEnv { libpulseaudio pipewire vulkan-loader - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXfixes - xorg.libXext - xorg.libxcb - xorg.libXcursor - xorg.libXinerama - xorg.libXi - xorg.libXrandr - xorg.libXScrnSaver - xorg.libXxf86vm - xorg.libXau - xorg.libXdmcp + libx11 + libxcomposite + libxdamage + libxfixes + libxext + libxcb + libxcursor + libxinerama + libxi + libxrandr + libxscrnsaver + libxxf86vm + libxau + libxdmcp ]; targetPkgs = pkgs: [ celeste ]; diff --git a/pkgs/by-name/ce/centerpiece/package.nix b/pkgs/by-name/ce/centerpiece/package.nix index eeb859bbe4e8..df2414229b3c 100644 --- a/pkgs/by-name/ce/centerpiece/package.nix +++ b/pkgs/by-name/ce/centerpiece/package.nix @@ -10,7 +10,10 @@ libxkbcommon, wayland, enableX11 ? true, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage rec { @@ -35,10 +38,10 @@ rustPlatform.buildRustPackage rec { wayland ] ++ lib.optionals enableX11 [ - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ]; postFixup = lib.optional stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/ce/cernlib/package.nix b/pkgs/by-name/ce/cernlib/package.nix index 8c3bf0cdd570..03dd6992b523 100644 --- a/pkgs/by-name/ce/cernlib/package.nix +++ b/pkgs/by-name/ce/cernlib/package.nix @@ -9,7 +9,10 @@ openssl, libnsl, motif, - xorg, + libxt, + libxft, + libxaw, + libx11, libxcrypt, }: @@ -51,10 +54,10 @@ stdenv.mkDerivation rec { freetype gfortran openssl - xorg.libX11 - xorg.libXaw - xorg.libXft - xorg.libXt + libx11 + libxaw + libxft + libxt libxcrypt motif ] diff --git a/pkgs/by-name/cg/cgminer/package.nix b/pkgs/by-name/cg/cgminer/package.nix index 8e96b24e0310..8a4d6bb1a164 100644 --- a/pkgs/by-name/cg/cgminer/package.nix +++ b/pkgs/by-name/cg/cgminer/package.nix @@ -11,7 +11,9 @@ ocl-icd, opencl-headers, libusb1, - xorg, + libxinerama, + libxext, + libx11, jansson, }: @@ -37,9 +39,9 @@ stdenv.mkDerivation rec { ncurses ocl-icd opencl-headers - xorg.libX11 - xorg.libXext - xorg.libXinerama + libx11 + libxext + libxinerama jansson libusb1 ]; diff --git a/pkgs/by-name/cg/cgns/package.nix b/pkgs/by-name/cg/cgns/package.nix index f027bd13fe79..817d5f39431f 100644 --- a/pkgs/by-name/cg/cgns/package.nix +++ b/pkgs/by-name/cg/cgns/package.nix @@ -7,7 +7,7 @@ gfortran, tk, hdf5, - xorg, + libxmu, libGLU, withTools ? false, testers, @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withTools [ tk - xorg.libXmu + libxmu libGLU ]; diff --git a/pkgs/by-name/ch/cherry/package.nix b/pkgs/by-name/ch/cherry/package.nix index 55f778cc7372..ee5f2613e8f3 100644 --- a/pkgs/by-name/ch/cherry/package.nix +++ b/pkgs/by-name/ch/cherry/package.nix @@ -2,7 +2,8 @@ lib, stdenv, fetchFromGitHub, - xorg, + mkfontscale, + fonttosfnt, }: stdenv.mkDerivation rec { @@ -17,8 +18,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - xorg.fonttosfnt - xorg.mkfontdir + fonttosfnt + mkfontscale ]; buildPhase = '' diff --git a/pkgs/by-name/ci/cinnamon-desktop/package.nix b/pkgs/by-name/ci/cinnamon-desktop/package.nix index 56fafa564c12..749f38a0d900 100644 --- a/pkgs/by-name/ci/cinnamon-desktop/package.nix +++ b/pkgs/by-name/ci/cinnamon-desktop/package.nix @@ -14,7 +14,9 @@ stdenv, systemd, xkeyboard_config, - xorg, + libxrandr, + libxext, + libxkbfile, wrapGAppsHook3, glib, }: @@ -46,9 +48,9 @@ stdenv.mkDerivation rec { isocodes systemd xkeyboard_config - xorg.libxkbfile - xorg.libXext - xorg.libXrandr + libxkbfile + libxext + libxrandr ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix index 57f16731c8bf..f4d8d0e7d83b 100644 --- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix +++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix @@ -22,7 +22,10 @@ pam, cairo, xdotool, - xorg, + libxrandr, + libxinerama, + libxext, + libx11, iso-flags-png-320x240, }: @@ -61,10 +64,10 @@ stdenv.mkDerivation rec { gtk3 glib - xorg.libXext - xorg.libXinerama - xorg.libX11 - xorg.libXrandr + libxext + libxinerama + libx11 + libxrandr (python3.withPackages ( pp: with pp; [ diff --git a/pkgs/by-name/ci/cinnamon-session/package.nix b/pkgs/by-name/ci/cinnamon-session/package.nix index 501f001979c2..6167b605a5a7 100644 --- a/pkgs/by-name/ci/cinnamon-session/package.nix +++ b/pkgs/by-name/ci/cinnamon-session/package.nix @@ -17,7 +17,13 @@ systemd, wrapGAppsHook3, xapp, - xorg, + libxtst, + libxrender, + libxext, + libxcomposite, + libxau, + libx11, + xtrans, libexecinfo, pango, }: @@ -49,17 +55,17 @@ stdenv.mkDerivation rec { glib libcanberra pango - xorg.libX11 - xorg.libXext + libx11 + libxext xapp - xorg.libXau - xorg.libXcomposite + libxau + libxcomposite systemd - xorg.libXtst - xorg.libXrender - xorg.xtrans + libxtst + libxrender + xtrans # other (not meson.build) cinnamon-settings-daemon diff --git a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix index a97f7d879630..8238c58ccbf1 100644 --- a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix +++ b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix @@ -19,7 +19,9 @@ polkit, librsvg, libwacom, - xorg, + libxi, + libxext, + libx11, fontconfig, tzdata, nss, @@ -58,9 +60,9 @@ stdenv.mkDerivation rec { polkit librsvg libwacom - xorg.libXext - xorg.libX11 - xorg.libXi + libxext + libx11 + libxi fontconfig nss libgudev diff --git a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix index 77dfa24fc3cf..1a571c3d3e94 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer7/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer7/package.nix @@ -19,7 +19,10 @@ libxslt, nspr, nss, - xorg, + libxscrnsaver, + libx11, + libsm, + libice, buildFHSEnv, copyDesktopItems, makeDesktopItem, @@ -65,10 +68,10 @@ let libxslt nspr nss - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXScrnSaver + libice + libsm + libx11 + libxscrnsaver ]; unpackPhase = '' diff --git a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix index f5f65382a762..acae24140b3d 100644 --- a/pkgs/by-name/ci/ciscoPacketTracer8/package.nix +++ b/pkgs/by-name/ci/ciscoPacketTracer8/package.nix @@ -20,7 +20,24 @@ nspr, nss, wayland, - xorg, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libsm, + libice, + libxcb, buildFHSEnv, copyDesktopItems, makeDesktopItem, @@ -77,24 +94,24 @@ let nspr nss wayland - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm + libice + libsm + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxcb + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-wm ]; unpackPhase = '' diff --git a/pkgs/by-name/cl/clanlib/package.nix b/pkgs/by-name/cl/clanlib/package.nix index f97087bd9257..5ecd5b46fec5 100644 --- a/pkgs/by-name/cl/clanlib/package.nix +++ b/pkgs/by-name/cl/clanlib/package.nix @@ -6,7 +6,7 @@ libGL, libpng, pkg-config, - xorg, + xorgproto, freetype, fontconfig, alsa-lib, @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libGL libpng - xorg.xorgproto + xorgproto freetype fontconfig alsa-lib diff --git a/pkgs/by-name/cl/clapper/package.nix b/pkgs/by-name/cl/clapper/package.nix index e1c0393e23ea..56154daf4c3d 100644 --- a/pkgs/by-name/cl/clapper/package.nix +++ b/pkgs/by-name/cl/clapper/package.nix @@ -3,7 +3,7 @@ clapper-unwrapped, wrapGAppsHook4, gobject-introspection, - xorg, + lndir, clapper-enhancers, }: @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ wrapGAppsHook4 gobject-introspection - xorg.lndir + lndir ]; buildInputs = [ clapper-unwrapped ] ++ clapper-unwrapped.buildInputs; diff --git a/pkgs/by-name/cl/claws-mail/package.nix b/pkgs/by-name/cl/claws-mail/package.nix index c3ce6862c281..dcd0e50bf22f 100644 --- a/pkgs/by-name/cl/claws-mail/package.nix +++ b/pkgs/by-name/cl/claws-mail/package.nix @@ -24,7 +24,7 @@ # Arguments to include external libraries enableLibSM ? true, - xorg, + libsm, enableGnuTLS ? true, gnutls, enableEnchant ? enableSpellcheck, @@ -179,7 +179,7 @@ let { flags = [ "libsm" ]; enabled = enableLibSM; - deps = [ xorg.libSM ]; + deps = [ libsm ]; } { flags = [ "litehtml_viewer-plugin" ]; diff --git a/pkgs/by-name/cl/clearlyU/package.nix b/pkgs/by-name/cl/clearlyU/package.nix index bba31404b07b..7198b1393830 100644 --- a/pkgs/by-name/cl/clearlyU/package.nix +++ b/pkgs/by-name/cl/clearlyU/package.nix @@ -2,7 +2,8 @@ lib, stdenv, fetchurl, - xorg, + mkfontscale, + fonttosfnt, libfaketime, }: @@ -16,8 +17,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - xorg.fonttosfnt - xorg.mkfontscale + fonttosfnt + mkfontscale libfaketime ]; diff --git a/pkgs/by-name/cl/clickup/package.nix b/pkgs/by-name/cl/clickup/package.nix index fe6a05d37577..d9d92ce54de6 100644 --- a/pkgs/by-name/cl/clickup/package.nix +++ b/pkgs/by-name/cl/clickup/package.nix @@ -17,7 +17,7 @@ let appimage = appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: [ pkgs.xorg.libxkbfile ]; + extraPkgs = pkgs: [ pkgs.libxkbfile ]; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/cl/clipboard-jh/package.nix b/pkgs/by-name/cl/clipboard-jh/package.nix index 96443b89733b..e3bd85271cc6 100644 --- a/pkgs/by-name/cl/clipboard-jh/package.nix +++ b/pkgs/by-name/cl/clipboard-jh/package.nix @@ -8,7 +8,7 @@ wayland-protocols, wayland-scanner, wayland, - xorg, + libx11, nix-update-script, alsa-lib, openssl, @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libffi wayland-protocols wayland - xorg.libX11 + libx11 alsa-lib ]; diff --git a/pkgs/by-name/cn/cnping/package.nix b/pkgs/by-name/cn/cnping/package.nix index 9efb14936c68..5ad90e9a4a7e 100644 --- a/pkgs/by-name/cn/cnping/package.nix +++ b/pkgs/by-name/cn/cnping/package.nix @@ -3,7 +3,9 @@ stdenv, fetchFromGitHub, libglvnd, - xorg, + libxinerama, + libxext, + libx11, }: stdenv.mkDerivation { @@ -20,9 +22,9 @@ stdenv.mkDerivation { buildInputs = [ libglvnd - xorg.libXinerama - xorg.libXext - xorg.libX11 + libxinerama + libxext + libx11 ]; # The "linuxinstall" target won't work for us: diff --git a/pkgs/by-name/co/code-server/package.nix b/pkgs/by-name/co/code-server/package.nix index a6fbb49d73d2..eefc92499d8e 100644 --- a/pkgs/by-name/co/code-server/package.nix +++ b/pkgs/by-name/co/code-server/package.nix @@ -16,7 +16,8 @@ nodejs_20, node-gyp, libsecret, - xorg, + libx11, + libxkbfile, ripgrep, cctools, xcbuild, @@ -137,8 +138,8 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libX11 - xorg.libxkbfile + libx11 + libxkbfile ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix index f6849d326a87..77ed45f951ae 100644 --- a/pkgs/by-name/co/codeql/package.nix +++ b/pkgs/by-name/co/codeql/package.nix @@ -3,7 +3,11 @@ stdenv, fetchzip, zlib, - xorg, + libxtst, + libxrender, + libxi, + libxext, + libx11, freetype, jdk17, curl, @@ -24,11 +28,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ zlib - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXtst - xorg.libXrender + libx11 + libxext + libxi + libxtst + libxrender freetype jdk17 (lib.getLib stdenv.cc.cc) diff --git a/pkgs/by-name/co/cogl/package.nix b/pkgs/by-name/co/cogl/package.nix index e3d1975ac146..a51b9b182871 100644 --- a/pkgs/by-name/co/cogl/package.nix +++ b/pkgs/by-name/co/cogl/package.nix @@ -6,7 +6,10 @@ libGL, glib, gdk-pixbuf, - xorg, + libxrandr, + libxfixes, + libxdamage, + libxcomposite, libintl, pangoSupport ? true, pango, @@ -87,10 +90,10 @@ stdenv.mkDerivation rec { libgbm mesa-gl-headers libGL - xorg.libXrandr - xorg.libXfixes - xorg.libXcomposite - xorg.libXdamage + libxrandr + libxfixes + libxcomposite + libxdamage ] ++ lib.optionals gstreamerSupport [ gst_all_1.gstreamer diff --git a/pkgs/by-name/co/colmap/package.nix b/pkgs/by-name/co/colmap/package.nix index 27ed6edf3f53..2c3c7289cc11 100644 --- a/pkgs/by-name/co/colmap/package.nix +++ b/pkgs/by-name/co/colmap/package.nix @@ -21,7 +21,7 @@ config, stdenv, qt5, - xorg, + libsm, cudaSupport ? config.cudaSupport, cudaCapabilities ? cudaPackages.flags.cudaCapabilities, cudaPackages, @@ -105,7 +105,7 @@ stdenv'.mkDerivation { cgal gmp mpfr - xorg.libSM + libsm ] ++ depsAlsoForPycolmap; diff --git a/pkgs/by-name/co/commandergenius/package.nix b/pkgs/by-name/co/commandergenius/package.nix index 62065d635370..70d515fdd09a 100644 --- a/pkgs/by-name/co/commandergenius/package.nix +++ b/pkgs/by-name/co/commandergenius/package.nix @@ -15,7 +15,7 @@ SDL2_mixer, SDL2_ttf, python3, - xorg, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { zlib curl python3 - xorg.libX11 + libx11 ]; cmakeFlags = [ diff --git a/pkgs/by-name/co/conda/package.nix b/pkgs/by-name/co/conda/package.nix index 50c657d7f893..6bdeec27e4de 100644 --- a/pkgs/by-name/co/conda/package.nix +++ b/pkgs/by-name/co/conda/package.nix @@ -8,19 +8,24 @@ libselinux, libarchive, libGL, - xorg, + libxrender, + libxi, + libxau, + libx11, + libsm, + libice, zlib, # Conda installs its packages and environments under this directory installationPath ? "~/.conda", # Conda manages most pkgs itself, but expects a few to be on the system. condaDeps ? [ stdenv.cc - xorg.libSM - xorg.libICE - xorg.libX11 - xorg.libXau - xorg.libXi - xorg.libXrender + libsm + libice + libx11 + libxau + libxi + libxrender libselinux libGL zlib @@ -117,7 +122,7 @@ buildFHSEnv { export NIX_CFLAGS_LINK="-L${installationPath}/lib" # Some other required environment variables export FONTCONFIG_FILE=/etc/fonts/fonts.conf - export QTCOMPOSE=${xorg.libX11}/share/X11/locale + export QTCOMPOSE=${libx11}/share/X11/locale export LIBARCHIVE=${lib.getLib libarchive}/lib/libarchive.so # Allows `conda activate` to work properly if [ ! -f ${condaSh} ]; then diff --git a/pkgs/by-name/co/conduktor/package.nix b/pkgs/by-name/co/conduktor/package.nix index a84c63fc6789..ee86a659cacd 100644 --- a/pkgs/by-name/co/conduktor/package.nix +++ b/pkgs/by-name/co/conduktor/package.nix @@ -10,7 +10,7 @@ pango, cairo, gdk-pixbuf, - xorg, + libxtst, makeBinaryWrapper, makeDesktopItem, copyDesktopItems, @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { pango cairo gdk-pixbuf - xorg.libXtst + libxtst ] } \ --add-flags "--module-path ${openjfx_jdk}/lib --add-modules=javafx.controls,javafx.fxml" diff --git a/pkgs/by-name/co/coppwr/package.nix b/pkgs/by-name/co/coppwr/package.nix index 16d0110ec7d7..a7fdf7563cb8 100644 --- a/pkgs/by-name/co/coppwr/package.nix +++ b/pkgs/by-name/co/coppwr/package.nix @@ -8,7 +8,9 @@ vulkan-loader, wayland, libGL, - xorg, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -35,9 +37,9 @@ rustPlatform.buildRustPackage (finalAttrs: { vulkan-loader wayland libGL - xorg.libXcursor - xorg.libXi - xorg.libX11 + libxcursor + libxi + libx11 ]; preBuild = '' diff --git a/pkgs/by-name/co/cov-build/package.nix b/pkgs/by-name/co/cov-build/package.nix index 46c79b66f898..c753437bb0ac 100644 --- a/pkgs/by-name/co/cov-build/package.nix +++ b/pkgs/by-name/co/cov-build/package.nix @@ -8,7 +8,9 @@ alsa-lib, libxcrypt-legacy, lttng-ust_2_12, - xorg, + libxtst, + libxrender, + libxext, zlib, }: @@ -36,9 +38,9 @@ stdenv.mkDerivation rec { alsa-lib libxcrypt-legacy lttng-ust_2_12 - xorg.libXext - xorg.libXrender - xorg.libXtst + libxext + libxrender + libxtst zlib ]; diff --git a/pkgs/by-name/cr/creep/package.nix b/pkgs/by-name/cr/creep/package.nix index f79b3e228f82..06cab50ef7ad 100644 --- a/pkgs/by-name/cr/creep/package.nix +++ b/pkgs/by-name/cr/creep/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, libfaketime, - xorg, + mkfontscale, + fonttosfnt, }: stdenv.mkDerivation rec { @@ -19,8 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libfaketime - xorg.fonttosfnt - xorg.mkfontscale + fonttosfnt + mkfontscale ]; buildPhase = '' diff --git a/pkgs/by-name/cr/crossfire-client/package.nix b/pkgs/by-name/cr/crossfire-client/package.nix index 00ed610a2c5d..79ac50a254c0 100644 --- a/pkgs/by-name/cr/crossfire-client/package.nix +++ b/pkgs/by-name/cr/crossfire-client/package.nix @@ -14,7 +14,8 @@ libpng, fribidi, harfbuzzFull, - xorg, + libxdmcp, + libpthread-stubs, util-linux, curl, SDL2, @@ -49,8 +50,8 @@ stdenv.mkDerivation { libpng fribidi harfbuzzFull - xorg.libpthreadstubs - xorg.libXdmcp + libpthread-stubs + libxdmcp curl SDL2 SDL2_image diff --git a/pkgs/by-name/cr/crusader/package.nix b/pkgs/by-name/cr/crusader/package.nix index ff10d08eca57..6a988c1e3631 100644 --- a/pkgs/by-name/cr/crusader/package.nix +++ b/pkgs/by-name/cr/crusader/package.nix @@ -13,7 +13,9 @@ fontconfig, libgcc, libxkbcommon, - xorg, + libxi, + libxcursor, + libx11, libGL, wayland, @@ -50,9 +52,9 @@ rustPlatform.buildRustPackage rec { libxkbcommon ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - xorg.libXcursor - xorg.libXi + libx11 + libxcursor + libxi ]; # required for crusader-gui diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix index 1993682eb0ac..4d445fa00c80 100644 --- a/pkgs/by-name/cu/curv/package.nix +++ b/pkgs/by-name/cu/curv/package.nix @@ -14,7 +14,12 @@ makeWrapper, openexr, onetbb, - xorg, + libxrandr, + libxi, + libxinerama, + libxext, + libxcursor, + libx11, ilmbase, llvmPackages, unstableGitUpdater, @@ -49,12 +54,12 @@ stdenv.mkDerivation { libpng openexr onetbb - xorg.libX11 - xorg.libXcursor - xorg.libXext - xorg.libXi - xorg.libXinerama - xorg.libXrandr + libx11 + libxcursor + libxext + libxi + libxinerama + libxrandr ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ilmbase diff --git a/pkgs/by-name/da/daktilo/package.nix b/pkgs/by-name/da/daktilo/package.nix index e9b3e9773a61..ca4158b7b718 100644 --- a/pkgs/by-name/da/daktilo/package.nix +++ b/pkgs/by-name/da/daktilo/package.nix @@ -6,7 +6,9 @@ unixtools, pkg-config, alsa-lib, - xorg, + libxtst, + libxi, + libx11, }: rustPlatform.buildRustPackage rec { @@ -29,9 +31,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ alsa-lib - xorg.libX11 - xorg.libXi - xorg.libXtst + libx11 + libxi + libxtst ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/da/darkplaces/package.nix b/pkgs/by-name/da/darkplaces/package.nix index 7776b8a984cd..f970515af9c8 100644 --- a/pkgs/by-name/da/darkplaces/package.nix +++ b/pkgs/by-name/da/darkplaces/package.nix @@ -6,7 +6,7 @@ libjpeg, SDL2, libvorbis, - xorg, + libx11, }: stdenv.mkDerivation { pname = "darkplaces"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { zlib libjpeg SDL2 - xorg.libX11 + libx11 ]; buildFlags = [ "release" ]; diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix index ec22c2d055c7..0b77d82e0942 100644 --- a/pkgs/by-name/da/davinci-resolve/package.nix +++ b/pkgs/by-name/da/davinci-resolve/package.nix @@ -9,7 +9,28 @@ addDriverRunpath, dbus, libGLU, - xorg, + xkeyboard-config, + libxcb-util, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxxf86vm, + libxt, + libxtst, + libxrender, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libsm, + libice, + libxcb, buildFHSEnv, bash, writeText, @@ -46,7 +67,7 @@ let # Pretty sure, there are missing dependencies ... buildInputs = [ libGLU - xorg.libXxf86vm + libxxf86vm ]; src = @@ -221,28 +242,28 @@ buildFHSEnv { python3.pkgs.numpy udev xdg-utils # xdg-open needed to open URLs - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.libXrender - xorg.libXt - xorg.libXtst - xorg.libXxf86vm - xorg.libxcb - xorg.xcbutil - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - xorg.xkeyboardconfig + libice + libsm + libx11 + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxinerama + libxrandr + libxrender + libxt + libxtst + libxxf86vm + libxcb + libxcb-util + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-wm + xkeyboard-config zlib ]; diff --git a/pkgs/by-name/db/dbus/package.nix b/pkgs/by-name/db/dbus/package.nix index f101a9c4b4db..8344e570cfaa 100644 --- a/pkgs/by-name/db/dbus/package.nix +++ b/pkgs/by-name/db/dbus/package.nix @@ -15,7 +15,9 @@ autoreconfHook, autoconf-archive, x11Support ? (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), - xorg, + libx11, + libsm, + libice, }: stdenv.mkDerivation rec { @@ -70,9 +72,9 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals x11Support [ - xorg.libX11 - xorg.libICE - xorg.libSM + libx11 + libice + libsm ] ++ lib.optional enableSystemd systemdMinimal ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/dd/ddcutil/package.nix b/pkgs/by-name/dd/ddcutil/package.nix index 0b67ce5e17f7..449904b5abdb 100644 --- a/pkgs/by-name/dd/ddcutil/package.nix +++ b/pkgs/by-name/dd/ddcutil/package.nix @@ -10,7 +10,8 @@ libgudev, libusb1, libdrm, - xorg, + libxrandr, + libxext, }: stdenv.mkDerivation rec { @@ -34,8 +35,8 @@ stdenv.mkDerivation rec { libgudev libusb1 udev - xorg.libXext - xorg.libXrandr + libxext + libxrandr ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/de/deezer-enhanced/package.nix b/pkgs/by-name/de/deezer-enhanced/package.nix index bbc0468530f3..5f850f2cdd27 100644 --- a/pkgs/by-name/de/deezer-enhanced/package.nix +++ b/pkgs/by-name/de/deezer-enhanced/package.nix @@ -9,7 +9,13 @@ gnutar, ### Libs - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxcb, libxkbcommon, glib, nss, @@ -47,13 +53,13 @@ stdenvNoCC.mkDerivation rec { buildInputs = [ ### Xorg libs - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxcb + libx11 + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxcb ### Systemd libs systemdLibs @@ -90,13 +96,13 @@ stdenvNoCC.mkDerivation rec { --set LD_LIBRARY_PATH ${ lib.makeLibraryPath [ ### Xorg libs - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxcb + libx11 + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxcb ### Systemd libs systemdLibs diff --git a/pkgs/by-name/de/densify/package.nix b/pkgs/by-name/de/densify/package.nix index 0cac63030e5c..1f1d018da3f2 100644 --- a/pkgs/by-name/de/densify/package.nix +++ b/pkgs/by-name/de/densify/package.nix @@ -5,7 +5,7 @@ gtk3, gobject-introspection, wrapGAppsHook3, - xorg, + xrandr, gnugrep, ghostscript, libnotify, @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { lib.makeBinPath [ ghostscript gnugrep - xorg.xrandr + xrandr libnotify ] }" diff --git a/pkgs/by-name/di/dina-font/package.nix b/pkgs/by-name/di/dina-font/package.nix index 4b6c1c613144..269db69affa6 100644 --- a/pkgs/by-name/di/dina-font/package.nix +++ b/pkgs/by-name/di/dina-font/package.nix @@ -4,7 +4,8 @@ fetchzip, fontforge, bdftopcf, - xorg, + mkfontscale, + fonttosfnt, }: stdenv.mkDerivation { @@ -26,8 +27,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ fontforge bdftopcf - xorg.mkfontscale - xorg.fonttosfnt + mkfontscale + fonttosfnt ]; buildPhase = '' diff --git a/pkgs/by-name/di/directfb/package.nix b/pkgs/by-name/di/directfb/package.nix index 013b0f0f62c3..5fc7e7458b68 100644 --- a/pkgs/by-name/di/directfb/package.nix +++ b/pkgs/by-name/di/directfb/package.nix @@ -13,7 +13,10 @@ libpng, giflib, enableX11 ? true, - xorg, + libxrender, + libxext, + libx11, + xorgproto, enableSDL ? true, SDL, }: @@ -87,10 +90,10 @@ stdenv.mkDerivation rec { ] ++ lib.optional enableSDL SDL ++ lib.optionals enableX11 [ - xorg.xorgproto - xorg.libX11 - xorg.libXext - xorg.libXrender + xorgproto + libx11 + libxext + libxrender ]; env = { diff --git a/pkgs/by-name/di/displaycal/package.nix b/pkgs/by-name/di/displaycal/package.nix index f22378ff93d9..c441b4632aa7 100644 --- a/pkgs/by-name/di/displaycal/package.nix +++ b/pkgs/by-name/di/displaycal/package.nix @@ -5,7 +5,11 @@ wrapGAppsHook3, gtk3, librsvg, - xorg, + libxxf86vm, + libxrandr, + libxinerama, + libxext, + libx11, argyllcms, }: @@ -41,11 +45,11 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 librsvg - xorg.libX11 - xorg.libXxf86vm - xorg.libXext - xorg.libXinerama - xorg.libXrandr + libx11 + libxxf86vm + libxext + libxinerama + libxrandr ]; # Workaround for eoyilmaz/displaycal-py3#261 diff --git a/pkgs/by-name/dj/djview/package.nix b/pkgs/by-name/dj/djview/package.nix index 1945c82c063b..4ea51bc96674 100644 --- a/pkgs/by-name/dj/djview/package.nix +++ b/pkgs/by-name/dj/djview/package.nix @@ -8,7 +8,7 @@ pkg-config, djvulibre, libsForQt5, - xorg, + libxt, libtiff, }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ djvulibre libsForQt5.qtbase - xorg.libXt + libxt libtiff ]; diff --git a/pkgs/by-name/dr/dragonfly-reverb/package.nix b/pkgs/by-name/dr/dragonfly-reverb/package.nix index 305854d58ad9..613e3d9e4edc 100644 --- a/pkgs/by-name/dr/dragonfly-reverb/package.nix +++ b/pkgs/by-name/dr/dragonfly-reverb/package.nix @@ -5,7 +5,7 @@ libjack2, libGL, pkg-config, - xorg, + libx11, }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 - xorg.libX11 + libx11 libGL ]; diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix index 6a588d8ca82b..e9b98a9a5a7e 100644 --- a/pkgs/by-name/dr/drawterm/package.nix +++ b/pkgs/by-name/dr/drawterm/package.nix @@ -5,7 +5,8 @@ unstableGitUpdater, installShellFiles, makeWrapper, - xorg, + libxt, + libx11, pkg-config, wayland-scanner, pipewire, @@ -51,8 +52,8 @@ stdenv.mkDerivation { libdecor ] ++ lib.optionals withXorg [ - xorg.libX11 - xorg.libXt + libx11 + libxt ]; makeFlags = diff --git a/pkgs/by-name/dr/dreamchess/package.nix b/pkgs/by-name/dr/dreamchess/package.nix index d53a874d8d91..6862666c8980 100644 --- a/pkgs/by-name/dr/dreamchess/package.nix +++ b/pkgs/by-name/dr/dreamchess/package.nix @@ -17,7 +17,8 @@ libXext, libGL, libGLU, - xorg, + libx11, + libxcb, }: stdenv.mkDerivation (finalAttrs: { @@ -46,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: { libXext libGL libGLU - xorg.libxcb - xorg.libX11 + libxcb + libx11 ]; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/dr/drumkv1/package.nix b/pkgs/by-name/dr/drumkv1/package.nix index c7b30b6e4310..12b3981c5ef7 100644 --- a/pkgs/by-name/dr/drumkv1/package.nix +++ b/pkgs/by-name/dr/drumkv1/package.nix @@ -10,7 +10,7 @@ liblo, lv2, qt6, - xorg, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { libsndfile liblo lv2 - xorg.libX11 + libx11 qt6.qtbase qt6.qtwayland qt6.qtsvg diff --git a/pkgs/by-name/e-/e-search/package.nix b/pkgs/by-name/e-/e-search/package.nix index 6d7b1fa47a6a..951cc856cb65 100644 --- a/pkgs/by-name/e-/e-search/package.nix +++ b/pkgs/by-name/e-/e-search/package.nix @@ -26,7 +26,11 @@ libsForQt5, pango, pangomm, - xorg, + libxt, + libxtst, + libxrandr, + libx11, + libxcb, zlib, nix-update-script, commandLineArgs ? "", @@ -108,11 +112,11 @@ stdenv.mkDerivation (finalAttrs: { libsForQt5.qt5.qtxmlpatterns pango pangomm - xorg.libX11 - xorg.libXrandr - xorg.libXt - xorg.libXtst - xorg.libxcb + libx11 + libxrandr + libxt + libxtst + libxcb zlib ]; diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix index bcd8c9340546..c5b324ae13dc 100644 --- a/pkgs/by-name/ed/eduke32/package.nix +++ b/pkgs/by-name/ed/eduke32/package.nix @@ -14,7 +14,7 @@ libGL, SDL2, SDL2_mixer, - xorg, + libx11, graphicsmagick, unstableGitUpdater, }: @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libGL - xorg.libX11 + libx11 ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ef/efont-unicode/package.nix b/pkgs/by-name/ef/efont-unicode/package.nix index 2c8d7c2c42b3..8fc8a4c71f53 100644 --- a/pkgs/by-name/ef/efont-unicode/package.nix +++ b/pkgs/by-name/ef/efont-unicode/package.nix @@ -3,7 +3,9 @@ stdenv, fetchurl, libfaketime, - xorg, + mkfontscale, + fonttosfnt, + bdftopcf, }: stdenv.mkDerivation rec { @@ -17,9 +19,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libfaketime - xorg.bdftopcf - xorg.fonttosfnt - xorg.mkfontscale + bdftopcf + fonttosfnt + mkfontscale ]; buildPhase = '' diff --git a/pkgs/by-name/eg/ego/package.nix b/pkgs/by-name/eg/ego/package.nix index ee135f7ff9c1..bffa1ea6ec8f 100644 --- a/pkgs/by-name/eg/ego/package.nix +++ b/pkgs/by-name/eg/ego/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, makeBinaryWrapper, acl, - xorg, + xhost, }: rustPlatform.buildRustPackage rec { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' - wrapProgram $out/bin/ego --prefix PATH : ${lib.makeBinPath [ xorg.xhost ]} + wrapProgram $out/bin/ego --prefix PATH : ${lib.makeBinPath [ xhost ]} ''; meta = { diff --git a/pkgs/by-name/el/electricsheep/package.nix b/pkgs/by-name/el/electricsheep/package.nix index 7fb02d70d2bf..41ec4b9f9227 100644 --- a/pkgs/by-name/el/electricsheep/package.nix +++ b/pkgs/by-name/el/electricsheep/package.nix @@ -8,7 +8,7 @@ lua5_1, curl, libpng, - xorg, + libxrender, pkg-config, flam3, libgtop, @@ -47,7 +47,7 @@ stdenv.mkDerivation { lua5_1 curl libpng - xorg.libXrender + libxrender flam3 libgtop boost diff --git a/pkgs/by-name/el/electron-fiddle/package.nix b/pkgs/by-name/el/electron-fiddle/package.nix index 85d7c0689272..9b3e4854410e 100644 --- a/pkgs/by-name/el/electron-fiddle/package.nix +++ b/pkgs/by-name/el/electron-fiddle/package.nix @@ -129,28 +129,28 @@ buildFHSEnv { nspr nss pango - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxcb + libx11 + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxcb # for running Electron before 18.3.5/19.0.5/20.0.0 inside gdk-pixbuf # for running Electron before 16.0.0 inside - xorg.libxshmfence + libxshmfence # for running Electron before 11.0.0 inside - xorg.libXcursor - xorg.libXi - xorg.libXrender - xorg.libXtst + libxcursor + libxi + libxrender + libxtst # for running Electron before 10.0.0 inside - xorg.libXScrnSaver + libxscrnsaver # for running Electron before 8.0.0 inside libuuid diff --git a/pkgs/by-name/el/eli/package.nix b/pkgs/by-name/el/eli/package.nix index f532faa20b31..27907866d2e2 100644 --- a/pkgs/by-name/el/eli/package.nix +++ b/pkgs/by-name/el/eli/package.nix @@ -8,7 +8,10 @@ fontconfig, tk, ncurses, - xorg, + libxt, + libxext, + libxaw, + libx11, file, }: @@ -47,10 +50,10 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses fontconfig - xorg.libX11.dev - xorg.libXt.dev - xorg.libXaw.dev - xorg.libXext.dev + libx11.dev + libxt.dev + libxaw.dev + libxext.dev ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/en/enpass/package.nix b/pkgs/by-name/en/enpass/package.nix index ef25ad4b3802..55b21ee2a309 100644 --- a/pkgs/by-name/en/enpass/package.nix +++ b/pkgs/by-name/en/enpass/package.nix @@ -2,7 +2,17 @@ stdenv, fetchurl, dpkg, - xorg, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxscrnsaver, + libxrender, + libxi, + libx11, + libsm, + libice, + libxcb, glib, libGLU, libGL, @@ -50,13 +60,13 @@ let libpulseaudio zlib dbus - xorg.libX11 - xorg.libXi - xorg.libSM - xorg.libICE - xorg.libXrender - xorg.libXScrnSaver - xorg.libxcb + libx11 + libxi + libsm + libice + libxrender + libxscrnsaver + libxcb libcap glib gtk3 @@ -64,10 +74,10 @@ let curl libuuid cups - xorg.xcbutilwm # libxcb-icccm.so.4 - xorg.xcbutilimage # libxcb-image.so.0 - xorg.xcbutilkeysyms # libxcb-keysyms.so.1 - xorg.xcbutilrenderutil # libxcb-render-util.so.0 + libxcb-wm # libxcb-icccm.so.4 + libxcb-image # libxcb-image.so.0 + libxcb-keysyms # libxcb-keysyms.so.1 + libxcb-render-util # libxcb-render-util.so.0 xz libxkbcommon ]; diff --git a/pkgs/by-name/en/entangle/package.nix b/pkgs/by-name/en/entangle/package.nix index 889bbedce93c..ef14a48b48cf 100644 --- a/pkgs/by-name/en/entangle/package.nix +++ b/pkgs/by-name/en/entangle/package.nix @@ -35,7 +35,8 @@ orc, udev, util-linux, - xorg, + libxtst, + libxdmcp, zstd, }: @@ -107,8 +108,8 @@ stdenv.mkDerivation (finalAttrs: { udev util-linux zstd - xorg.libXdmcp - xorg.libXtst + libxdmcp + libxtst ]; # Disable building of doc/reference since it requires network connection to render XML to HTML diff --git a/pkgs/by-name/en/envision/package.nix b/pkgs/by-name/en/envision/package.nix index 546cdcf30f10..830615a493de 100644 --- a/pkgs/by-name/en/envision/package.nix +++ b/pkgs/by-name/en/envision/package.nix @@ -35,11 +35,11 @@ buildFHSEnv { # Additional dependencies required by Monado when built using Envision libgbm shaderc - xorg.libX11 - xorg.libxcb - xorg.libXrandr - xorg.libXrender - xorg.xorgproto + libx11 + libxcb + libxrandr + libxrender + xorgproto SDL2 wayland mesa-gl-headers diff --git a/pkgs/by-name/en/envypn-font/package.nix b/pkgs/by-name/en/envypn-font/package.nix index 9c5bda82eeb1..991c27d9b2e6 100644 --- a/pkgs/by-name/en/envypn-font/package.nix +++ b/pkgs/by-name/en/envypn-font/package.nix @@ -3,7 +3,8 @@ stdenv, fetchurl, libfaketime, - xorg, + mkfontscale, + fonttosfnt, }: stdenv.mkDerivation rec { @@ -17,8 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libfaketime - xorg.fonttosfnt - xorg.mkfontscale + fonttosfnt + mkfontscale ]; unpackPhase = '' diff --git a/pkgs/by-name/ep/epick/package.nix b/pkgs/by-name/ep/epick/package.nix index abc25b068154..bc8dc6253ca9 100644 --- a/pkgs/by-name/ep/epick/package.nix +++ b/pkgs/by-name/ep/epick/package.nix @@ -8,7 +8,10 @@ fontconfig, freetype, libGL, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage rec { @@ -33,10 +36,10 @@ rustPlatform.buildRustPackage rec { expat fontconfig freetype - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ]; postInstall = '' diff --git a/pkgs/by-name/eq/eq10q/package.nix b/pkgs/by-name/eq/eq10q/package.nix index 3e758c0c94ca..377268ae9e49 100644 --- a/pkgs/by-name/eq/eq10q/package.nix +++ b/pkgs/by-name/eq/eq10q/package.nix @@ -9,7 +9,9 @@ libxcb, lv2, pkg-config, - xorg, + libxdmcp, + libpthread-stubs, + libxshmfence, }: stdenv.mkDerivation rec { pname = "eq10q"; @@ -28,9 +30,9 @@ stdenv.mkDerivation rec { gtkmm2 libxcb lv2 - xorg.libpthreadstubs - xorg.libXdmcp - xorg.libxshmfence + libpthread-stubs + libxdmcp + libxshmfence ]; patches = [ diff --git a/pkgs/by-name/et/etterna/package.nix b/pkgs/by-name/et/etterna/package.nix index 842495a98dab..569535a18b63 100644 --- a/pkgs/by-name/et/etterna/package.nix +++ b/pkgs/by-name/et/etterna/package.nix @@ -9,7 +9,11 @@ pkg-config, openssl, libGLU, - xorg, + libxvmc, + libxrandr, + libxinerama, + libxext, + libx11, alsa-lib, libjack2, libpulseaudio, @@ -49,11 +53,11 @@ stdenv.mkDerivation (finalAttrs: { libGLU libogg sse2neon - xorg.libXinerama - xorg.libXrandr - xorg.libX11 - xorg.libXext # Needed for DPMS - xorg.libXvMC + libxinerama + libxrandr + libx11 + libxext # Needed for DPMS + libxvmc ]; desktopItems = [ diff --git a/pkgs/by-name/eu/eureka-editor/package.nix b/pkgs/by-name/eu/eureka-editor/package.nix index e27027ae21f2..c611c410683f 100644 --- a/pkgs/by-name/eu/eureka-editor/package.nix +++ b/pkgs/by-name/eu/eureka-editor/package.nix @@ -5,7 +5,7 @@ fltk, zlib, xdg-utils, - xorg, + libxinerama, libjpeg, libGLU, }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { zlib xdg-utils libjpeg - xorg.libXinerama + libxinerama libGLU ]; diff --git a/pkgs/by-name/ev/everspace/package.nix b/pkgs/by-name/ev/everspace/package.nix index aa6edff81292..d8c8b86efb3a 100644 --- a/pkgs/by-name/ev/everspace/package.nix +++ b/pkgs/by-name/ev/everspace/package.nix @@ -17,7 +17,17 @@ openal, # Unreal Engine 4 Dependencies - xorg, + libxxf86vm, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxcursor, + libxau, + libx11, + libxcb, }: # Known issues: @@ -51,17 +61,17 @@ stdenv.mkDerivation rec { libGL # ue4 - xorg.libX11 - xorg.libXScrnSaver - xorg.libXau - xorg.libXcursor - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXxf86vm - xorg.libxcb + libx11 + libxscrnsaver + libxau + libxcursor + libxext + libxfixes + libxi + libxrandr + libxrender + libxxf86vm + libxcb ]; unpackPhase = '' diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix index 8d4937f0fa31..602b12276abf 100644 --- a/pkgs/by-name/ex/exegol/package.nix +++ b/pkgs/by-name/ex/exegol/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, python3Packages, - xorg, + xhost, }: python3Packages.buildPythonApplication rec { pname = "exegol"; @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { supabase ] ++ pyjwt.optional-dependencies.crypto - ++ [ xorg.xhost ] + ++ [ xhost ] ++ lib.optional (!stdenv.hostPlatform.isLinux) tzlocal; doCheck = true; diff --git a/pkgs/by-name/ex/exegol4/package.nix b/pkgs/by-name/ex/exegol4/package.nix index fd0b774384bd..9a3bfaed5d9e 100644 --- a/pkgs/by-name/ex/exegol4/package.nix +++ b/pkgs/by-name/ex/exegol4/package.nix @@ -2,7 +2,7 @@ fetchPypi, lib, python3Packages, - xorg, + xhost, }: python3Packages.buildPythonApplication rec { pname = "exegol"; @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { argcomplete tzlocal ] - ++ [ xorg.xhost ]; + ++ [ xhost ]; doCheck = true; diff --git a/pkgs/by-name/ex/exodus/package.nix b/pkgs/by-name/ex/exodus/package.nix index cf299cea789b..998a94578efb 100644 --- a/pkgs/by-name/ex/exodus/package.nix +++ b/pkgs/by-name/ex/exodus/package.nix @@ -12,7 +12,19 @@ atk, cairo, gdk-pixbuf, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxshmfence, + libxcb, xorg_sys_opengl, util-linux, alsa-lib, @@ -62,21 +74,21 @@ stdenv.mkDerivation (finalAttrs: { atk cairo gdk-pixbuf - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrender - xorg.libxshmfence - xorg.libXtst + libx11 + libxcb + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrender + libxshmfence + libxtst xorg_sys_opengl util-linux - xorg.libXrandr - xorg.libXScrnSaver + libxrandr + libxscrnsaver alsa-lib dbus.lib at-spi2-atk diff --git a/pkgs/by-name/fa/fastcompmgr/package.nix b/pkgs/by-name/fa/fastcompmgr/package.nix index 240b40b44b8c..46a881d0e5e4 100644 --- a/pkgs/by-name/fa/fastcompmgr/package.nix +++ b/pkgs/by-name/fa/fastcompmgr/package.nix @@ -1,7 +1,11 @@ { stdenv, fetchFromGitHub, - xorg, + libxrender, + libxfixes, + libxdamage, + libxcomposite, + libx11, pkgs, lib, }: @@ -19,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXfixes - xorg.libXrender + libx11 + libxcomposite + libxdamage + libxfixes + libxrender ]; installPhase = '' diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 98dee9336f1f..60f149c76b01 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -35,7 +35,9 @@ vulkan-loader, wayland, xfconf, - xorg, + libxext, + libxdmcp, + libxau, yyjson, zlib, zfs, @@ -169,9 +171,9 @@ stdenv.mkDerivation (finalAttrs: { libXrandr libxcb # Required by libxcb messages - xorg.libXau - xorg.libXdmcp - xorg.libXext + libxau + libxdmcp + libxext ] ++ lib.optionals xfceSupport [ # Needed for XFWM theme and XFCE Terminal font. diff --git a/pkgs/by-name/fb/fbmenugen/package.nix b/pkgs/by-name/fb/fbmenugen/package.nix index 5e56e114376f..9d9fe7d7b1a5 100644 --- a/pkgs/by-name/fb/fbmenugen/package.nix +++ b/pkgs/by-name/fb/fbmenugen/package.nix @@ -6,7 +6,7 @@ makeWrapper, perlPackages, replaceVars, - xorg, + xmessage, wrapGAppsHook3, gitUpdater, }: @@ -24,7 +24,7 @@ perlPackages.buildPerlPackage rec { patches = [ (replaceVars ./0001-Fix-paths.patch { - xmessage = xorg.xmessage; + xmessage = xmessage; inherit fluxbox gnused; # replaced in postPatch fbmenugen = null; @@ -46,7 +46,7 @@ perlPackages.buildPerlPackage rec { perlPackages.Gtk3 perlPackages.LinuxDesktopFiles perlPackages.perl - xorg.xmessage + xmessage ]; dontConfigure = true; diff --git a/pkgs/by-name/fe/feather-tk/package.nix b/pkgs/by-name/fe/feather-tk/package.nix index 8f1890ed47cf..18f9da5a1124 100644 --- a/pkgs/by-name/fe/feather-tk/package.nix +++ b/pkgs/by-name/fe/feather-tk/package.nix @@ -14,7 +14,7 @@ nativefiledialog-extended, nlohmann_json, plutovg, - xorg, + xvfb, zlib, python3Packages ? null, enableNFD ? true, @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = enableTests; nativeCheckInputs = lib.optionals (enableTests && stdenv.isLinux) [ - xorg.xvfb-run + xvfb-run ]; checkPhase = lib.optionalString enableTests '' diff --git a/pkgs/by-name/fe/feh/package.nix b/pkgs/by-name/fe/feh/package.nix index 5bfb7676320c..54fdfc74f589 100644 --- a/pkgs/by-name/fe/feh/package.nix +++ b/pkgs/by-name/fe/feh/package.nix @@ -3,7 +3,9 @@ stdenv, fetchFromGitHub, makeWrapper, - xorg, + libxt, + libxinerama, + libx11, imlib2Full, libjpeg, libpng, @@ -34,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - xorg.libXt - xorg.libX11 - xorg.libXinerama + libxt + libx11 + libxinerama imlib2Full libjpeg libpng diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index 8e251069a1e6..197e3a2671a3 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -23,7 +23,11 @@ libdrm, libGL, wayland, - xorg, + libxrender, + libxrandr, + libx11, + xorgproto, + libxcb, withQt ? true, qt6, }: @@ -35,11 +39,11 @@ let libdrm libGL wayland - xorg.libX11 - xorg.libxcb - xorg.libXrandr - xorg.libXrender - xorg.xorgproto + libx11 + libxcb + libxrandr + libxrender + xorgproto ]; pkgsCross32 = pkgsCross.gnu32; diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix index 4cbefda35698..57f7b0a7fc5c 100644 --- a/pkgs/by-name/fi/firefoxpwa/package.nix +++ b/pkgs/by-name/fi/firefoxpwa/package.nix @@ -24,7 +24,7 @@ pkg-config, stdenv, udev, - xorg, + libxscrnsaver, }: rustPlatform.buildRustPackage rec { @@ -74,7 +74,7 @@ rustPlatform.buildRustPackage rec { pciutils pipewire udev - xorg.libXScrnSaver + libxscrnsaver ] ++ gtk_modules ++ extraLibs; diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix index 8375fe0d3601..66f2d85cfe3a 100644 --- a/pkgs/by-name/fl/flaresolverr/package.nix +++ b/pkgs/by-name/fl/flaresolverr/package.nix @@ -8,7 +8,7 @@ chromium, python3, undetected-chromedriver, - xorg, + xvfb, nixosTests, }: @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${python}/bin/python $out/bin/flaresolverr \ --add-flags "$out/share/flaresolverr-${finalAttrs.version}/src/flaresolverr.py" \ - --prefix PATH : "${lib.makeBinPath [ xorg.xvfb ]}" + --prefix PATH : "${lib.makeBinPath [ xvfb ]}" ''; passthru = { diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index e1bf5f0e0b1c..7f7e51d963a9 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -56,7 +56,7 @@ wrapGAppsNoGuiHook, xdg-dbus-proxy, xmlto, - xorg, + libxau, zstd, withAutoSideloading ? false, withDconf ? lib.meta.availableOn stdenv.hostPlatform dconf, @@ -219,7 +219,7 @@ stdenv.mkDerivation (finalAttrs: { python3 wayland wayland-protocols - xorg.libXau + libxau zstd ] ++ lib.optional withDconf dconf diff --git a/pkgs/by-name/fl/flitter/package.nix b/pkgs/by-name/fl/flitter/package.nix index 4b9ddc259b59..5bb63f144f0b 100644 --- a/pkgs/by-name/fl/flitter/package.nix +++ b/pkgs/by-name/fl/flitter/package.nix @@ -4,7 +4,7 @@ rustPlatform, fetchFromGitHub, pkg-config, - xorg, + libx11, }: rustPlatform.buildRustPackage rec { @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - xorg.libX11 + libx11 ]; meta = { diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index f3eff48d9700..c11dd55225ca 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -21,7 +21,7 @@ nixosTests, openssh, sqliteSupport ? true, - xorg, + lndir, runCommand, stdenv, fetchFromGitea, @@ -167,7 +167,7 @@ buildGoModule rec { { nativeBuildInputs = [ brotli - xorg.lndir + lndir ]; } '' diff --git a/pkgs/by-name/fr/frame/package.nix b/pkgs/by-name/fr/frame/package.nix index b3fa616561ae..8e2755273597 100644 --- a/pkgs/by-name/fr/frame/package.nix +++ b/pkgs/by-name/fr/frame/package.nix @@ -4,7 +4,10 @@ stdenv, fetchurl, pkg-config, - xorg, + xorg-server, + libxi, + libxext, + libx11, }: stdenv.mkDerivation rec { @@ -20,10 +23,10 @@ stdenv.mkDerivation rec { stdenv ] ++ lib.optionals enableX11 [ - xorg.xorgserver - xorg.libX11 - xorg.libXext - xorg.libXi + xorg-server + libx11 + libxext + libxi ]; configureFlags = lib.optional enableX11 "--with-x11"; diff --git a/pkgs/by-name/fu/furtherance/package.nix b/pkgs/by-name/fu/furtherance/package.nix index 6dfaef0e9fb3..fc370f63110a 100644 --- a/pkgs/by-name/fu/furtherance/package.nix +++ b/pkgs/by-name/fu/furtherance/package.nix @@ -7,7 +7,10 @@ libxkbcommon, openssl, pkg-config, - xorg, + libxscrnsaver, + libxi, + libxcursor, + libx11, vulkan-loader, wayland, }: @@ -32,10 +35,10 @@ rustPlatform.buildRustPackage (finalAttrs: { fontconfig openssl libxkbcommon - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcursor - xorg.libXi + libx11 + libxscrnsaver + libxcursor + libxi vulkan-loader wayland ]; diff --git a/pkgs/by-name/ga/galaxy-buds-client/package.nix b/pkgs/by-name/ga/galaxy-buds-client/package.nix index eb16155be2aa..ecedbe0ceb6d 100644 --- a/pkgs/by-name/ga/galaxy-buds-client/package.nix +++ b/pkgs/by-name/ga/galaxy-buds-client/package.nix @@ -7,7 +7,9 @@ fontconfig, glib, libglvnd, - xorg, + libx11, + libsm, + libice, makeWrapper, makeDesktopItem, copyDesktopItems, @@ -45,9 +47,9 @@ buildDotnetModule rec { runtimeDeps = [ libglvnd - xorg.libSM - xorg.libICE - xorg.libX11 + libsm + libice + libx11 ]; postFixup = '' diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index dcba465b498f..8b2e15c0de74 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -8,7 +8,20 @@ pkg-config, ninja, cmake, - xorg, + libxxf86vm, + libxtst, + libxres, + libxrender, + libxmu, + libxi, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + xwininfo, + xprop, + libxcb, libdrm, libei, vulkan-loader, @@ -128,8 +141,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ pipewire hwdata - xorg.libX11 - xorg.libxcb + libx11 + libxcb wayland wayland-protocols vulkan-loader @@ -141,16 +154,16 @@ stdenv.mkDerivation (finalAttrs: { wlroots.buildInputs ++ [ # gamescope uses a custom wlroots branch - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXi - xorg.libXmu - xorg.libXrender - xorg.libXres - xorg.libXtst - xorg.libXxf86vm + libxcomposite + libxcursor + libxdamage + libxext + libxi + libxmu + libxrender + libxres + libxtst + libxxf86vm libavif libdrm libei @@ -175,8 +188,8 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram "$out/bin/gamescope" \ --prefix PATH : ${ lib.makeBinPath [ - xorg.xprop - xorg.xwininfo + xprop + xwininfo ] } diff --git a/pkgs/by-name/ga/gapcast/package.nix b/pkgs/by-name/ga/gapcast/package.nix index 57ed1665d766..ab868cd2413b 100644 --- a/pkgs/by-name/ga/gapcast/package.nix +++ b/pkgs/by-name/ga/gapcast/package.nix @@ -4,7 +4,7 @@ buildGoModule, fetchFromGitHub, libpcap, - xorg, + libx11, }: buildGoModule rec { @@ -22,7 +22,7 @@ buildGoModule rec { buildInputs = [ libpcap - xorg.libX11 + libx11 ]; ldflags = [ diff --git a/pkgs/by-name/ga/gauge/package.nix b/pkgs/by-name/ga/gauge/package.nix index cbc37f6d0a2f..5f568a9321ae 100644 --- a/pkgs/by-name/ga/gauge/package.nix +++ b/pkgs/by-name/ga/gauge/package.nix @@ -4,7 +4,7 @@ makeWrapper, stdenvNoCC, lib, - xorg, + lndir, gaugePlugins, plugins ? [ ], }: @@ -47,7 +47,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ gauge-unwrapped makeWrapper - xorg.lndir + lndir ]; passthru = { diff --git a/pkgs/by-name/gd/gdlauncher-carbon/package.nix b/pkgs/by-name/gd/gdlauncher-carbon/package.nix index 800a799b40fc..941875d3abd7 100644 --- a/pkgs/by-name/gd/gdlauncher-carbon/package.nix +++ b/pkgs/by-name/gd/gdlauncher-carbon/package.nix @@ -7,7 +7,13 @@ makeWrapper, copyDesktopItems, autoPatchelfHook, - xorg, + libxxf86vm, + libxrandr, + libxext, + libxcursor, + libx11, + xrandr, + libxcb, libpulseaudio, libGL, udev, @@ -46,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libxcb + libxcb stdenv.cc.cc.lib ]; @@ -70,11 +76,11 @@ stdenv.mkDerivation (finalAttrs: { postConfigure = let libPath = lib.makeLibraryPath [ - xorg.libX11 - xorg.libXext - xorg.libXcursor - xorg.libXrandr - xorg.libXxf86vm + libx11 + libxext + libxcursor + libxrandr + libxxf86vm # lwjgl libpulseaudio @@ -88,8 +94,8 @@ stdenv.mkDerivation (finalAttrs: { # Used for opening directories and URLs in the electron app xdg-utils - # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - xorg.xrandr + # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 + xrandr ]; in '' diff --git a/pkgs/by-name/ge/geis/package.nix b/pkgs/by-name/ge/geis/package.nix index 8446cb446a17..540c84ca8446 100644 --- a/pkgs/by-name/ge/geis/package.nix +++ b/pkgs/by-name/ge/geis/package.nix @@ -13,7 +13,10 @@ gobject-introspection, grail, gtk3, - xorg, + libxtst, + libxi, + libxext, + libx11, pango, xorgserver, testers, @@ -51,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: { gdk-pixbuf grail gtk3 - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXtst + libx11 + libxext + libxi + libxtst pango python3Packages.python xorgserver diff --git a/pkgs/by-name/ge/gencfsm/package.nix b/pkgs/by-name/ge/gencfsm/package.nix index 780684a117ff..89bd43c7cd80 100644 --- a/pkgs/by-name/ge/gencfsm/package.nix +++ b/pkgs/by-name/ge/gencfsm/package.nix @@ -14,7 +14,8 @@ gtk3, vala, wrapGAppsHook3, - xorg, + libsm, + libice, gobject-introspection, }: @@ -49,8 +50,8 @@ stdenv.mkDerivation rec { encfs gtk3 libgee - xorg.libSM - xorg.libICE + libsm + libice libsecret ]; diff --git a/pkgs/by-name/ge/genymotion/package.nix b/pkgs/by-name/ge/genymotion/package.nix index 6be7b711824a..1cfe08fb9dd7 100644 --- a/pkgs/by-name/ge/genymotion/package.nix +++ b/pkgs/by-name/ge/genymotion/package.nix @@ -7,7 +7,7 @@ zlib, libGL, glib, - xorg, + libx11, libxkbcommon, xdg-utils, libXrender, @@ -30,7 +30,7 @@ let stdenv.cc.cc zlib glib - xorg.libX11 + libx11 libxkbcommon libXmu libXi diff --git a/pkgs/by-name/ge/geogebra/package.nix b/pkgs/by-name/ge/geogebra/package.nix index 128b1973a50b..2c4b3610c3f5 100644 --- a/pkgs/by-name/ge/geogebra/package.nix +++ b/pkgs/by-name/ge/geogebra/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, libGL, - xorg, + libxxf86vm, jre, makeDesktopItem, makeWrapper, @@ -92,7 +92,7 @@ let --prefix LD_LIBRARY_PATH : "${ lib.makeLibraryPath [ libGL - xorg.libXxf86vm + libxxf86vm ] }" \ --set MESA_GL_VERSION_OVERRIDE 3.0 \ diff --git a/pkgs/by-name/gf/gfxstream/package.nix b/pkgs/by-name/gf/gfxstream/package.nix index af693f9d97ea..5ec352798319 100644 --- a/pkgs/by-name/gf/gfxstream/package.nix +++ b/pkgs/by-name/gf/gfxstream/package.nix @@ -12,7 +12,7 @@ libglvnd, vulkan-headers, vulkan-loader, - xorg, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { libglvnd vulkan-headers vulkan-loader - xorg.libX11 + libx11 ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libdrm) [ libdrm ]; diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix index 72b8d217748e..0a79f4f1874a 100644 --- a/pkgs/by-name/gh/ghostscript/package.nix +++ b/pkgs/by-name/gh/ghostscript/package.nix @@ -27,7 +27,10 @@ cupsSupport ? config.ghostscript.cups or (!stdenv.hostPlatform.isDarwin), cups, x11Support ? cupsSupport, - xorg, # with CUPS, X11 only adds very little + libice, + libx11, + libxext, + libxt, dynamicDrivers ? true, # for passthru.tests @@ -130,10 +133,10 @@ stdenv.mkDerivation rec { openjpeg ] ++ lib.optionals x11Support [ - xorg.libICE - xorg.libX11 - xorg.libXext - xorg.libXt + libice + libx11 + libxext + libxt ] ++ lib.optional cupsSupport cups; diff --git a/pkgs/by-name/gi/giac/package.nix b/pkgs/by-name/gi/giac/package.nix index c6b89f93fa4a..7c4c1754eb6d 100644 --- a/pkgs/by-name/gi/giac/package.nix +++ b/pkgs/by-name/gi/giac/package.nix @@ -28,7 +28,7 @@ enableGUI ? false, libGL, libGLU, - xorg, + libx11, fltk, enableMicroPy ? false, python3, @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { libGL libGLU fltk - xorg.libX11 + libx11 ] ++ lib.optional enableMicroPy python3; diff --git a/pkgs/by-name/gi/gimx/package.nix b/pkgs/by-name/gi/gimx/package.nix index 7b37c872dc57..5b7be0af6a25 100644 --- a/pkgs/by-name/gi/gimx/package.nix +++ b/pkgs/by-name/gi/gimx/package.nix @@ -9,7 +9,8 @@ libxml2, ncurses5, libmhash, - xorg, + libxi, + libx11, }: let @@ -45,8 +46,8 @@ stdenv.mkDerivation rec { libxml2 ncurses5 libmhash - xorg.libX11 - xorg.libXi + libx11 + libxi ]; installPhase = '' diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix index e36941a93de4..3ac3f6182756 100644 --- a/pkgs/by-name/gi/github-desktop/package.nix +++ b/pkgs/by-name/gi/github-desktop/package.nix @@ -10,7 +10,8 @@ curl, nss, nspr, - xorg, + libxdamage, + libx11, libdrm, alsa-lib, cups, @@ -53,8 +54,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { buildInputs = [ gnome-keyring - xorg.libXdamage - xorg.libX11 + libxdamage + libx11 libsecret git curl diff --git a/pkgs/by-name/gl/glee/package.nix b/pkgs/by-name/gl/glee/package.nix index 05da6adf308b..240e40f9fb07 100644 --- a/pkgs/by-name/gl/glee/package.nix +++ b/pkgs/by-name/gl/glee/package.nix @@ -5,7 +5,7 @@ cmake, libGLU, libGL, - xorg, + libx11, }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGLU libGL - xorg.libX11 + libx11 ]; postPatch = '' diff --git a/pkgs/by-name/gm/gmsh/package.nix b/pkgs/by-name/gm/gmsh/package.nix index 1b7b9655a6b7..67b2d65a3753 100644 --- a/pkgs/by-name/gm/gmsh/package.nix +++ b/pkgs/by-name/gm/gmsh/package.nix @@ -14,7 +14,15 @@ zlib, libGL, libGLU, - xorg, + libxrender, + libxinerama, + libxft, + libxfixes, + libxext, + libxcursor, + libx11, + libsm, + libice, opencascade-occt, llvmPackages, python3Packages, @@ -53,15 +61,15 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL libGLU - xorg.libXrender - xorg.libXcursor - xorg.libXfixes - xorg.libXext - xorg.libXft - xorg.libXinerama - xorg.libX11 - xorg.libSM - xorg.libICE + libxrender + libxcursor + libxfixes + libxext + libxft + libxinerama + libx11 + libsm + libice ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; diff --git a/pkgs/by-name/gn/gnome-flashback/package.nix b/pkgs/by-name/gn/gnome-flashback/package.nix index ee21354c1abe..4681896ebdb3 100644 --- a/pkgs/by-name/gn/gnome-flashback/package.nix +++ b/pkgs/by-name/gn/gnome-flashback/package.nix @@ -29,7 +29,7 @@ wrapGAppsHook3, writeTextFile, xkeyboard_config, - xorg, + libxxf86vm, nixosTests, runCommand, buildEnv, @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { libcanberra-gtk3 libpulseaudio libxkbfile - xorg.libXxf86vm + libxxf86vm polkit gdm gnome-panel diff --git a/pkgs/by-name/gn/gnome-panel/wrapper.nix b/pkgs/by-name/gn/gnome-panel/wrapper.nix index 0d7fb34e4772..cb7f6d5d160d 100644 --- a/pkgs/by-name/gn/gnome-panel/wrapper.nix +++ b/pkgs/by-name/gn/gnome-panel/wrapper.nix @@ -4,7 +4,7 @@ buildEnv, gnome-panel, gnome-flashback, - xorg, + lndir, glib, wrapGAppsHook3, panelModulePackages ? [ ], @@ -49,10 +49,10 @@ stdenv.mkDerivation { runHook preInstall mkdir -p $out - ${xorg.lndir}/bin/lndir -silent ${gnome-panel} $out + ${lndir}/bin/lndir -silent ${gnome-panel} $out rm -r $out/lib/gnome-panel/modules - ${xorg.lndir}/bin/lndir -silent ${panelModulesEnv} $out + ${lndir}/bin/lndir -silent ${panelModulesEnv} $out rm $out/share/systemd/user/gnome-panel.service substitute ${gnome-panel}/share/systemd/user/gnome-panel.service \ diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix index 0d43c58ba7eb..4fc3f41a0ed4 100644 --- a/pkgs/by-name/gn/gnome-session/package.nix +++ b/pkgs/by-name/gn/gnome-session/package.nix @@ -25,7 +25,7 @@ libxslt, gettext, systemd, - xorg, + xtrans, libepoxy, gnome-session-ctl, wrapGAppsHook4, @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { libICE gnome-desktop json-glib - xorg.xtrans + xtrans adwaita-icon-theme gnome-settings-daemon gsettings-desktop-schemas diff --git a/pkgs/by-name/go/go-hass-agent/package.nix b/pkgs/by-name/go/go-hass-agent/package.nix index f3d776d71fac..6e4681c8e9e0 100644 --- a/pkgs/by-name/go/go-hass-agent/package.nix +++ b/pkgs/by-name/go/go-hass-agent/package.nix @@ -8,7 +8,11 @@ pkg-config, writableTmpDirAsHomeHook, libglvnd, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxcursor, go, nix-update-script, }: @@ -52,11 +56,11 @@ buildGoModule (finalAttrs: { buildInputs = [ libglvnd - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.libXxf86vm + libxcursor + libxi + libxinerama + libxrandr + libxxf86vm ]; desktopItems = [ "assets/go-hass-agent.desktop" ]; diff --git a/pkgs/by-name/go/go-sct/package.nix b/pkgs/by-name/go/go-sct/package.nix index e1a2f47a52fb..95be022c323a 100644 --- a/pkgs/by-name/go/go-sct/package.nix +++ b/pkgs/by-name/go/go-sct/package.nix @@ -2,7 +2,8 @@ lib, buildGoModule, fetchFromGitHub, - xorg, + libxrandr, + libx11, wayland, }: @@ -25,8 +26,8 @@ buildGoModule { vendorHash = "sha256-Rx5/oORink2QtRcD+JqbyFroWYhuYmuYDzZ391R4Jsw="; buildInputs = [ - xorg.libX11 - xorg.libXrandr + libx11 + libxrandr wayland.dev ]; diff --git a/pkgs/by-name/go/go2tv/package.nix b/pkgs/by-name/go/go2tv/package.nix index 678cbc76854b..9858e2247b94 100644 --- a/pkgs/by-name/go/go2tv/package.nix +++ b/pkgs/by-name/go/go2tv/package.nix @@ -2,7 +2,13 @@ lib, buildGoModule, fetchFromGitHub, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxext, + libxcursor, + libx11, libglvnd, pkg-config, withGui ? true, @@ -24,13 +30,13 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXinerama - xorg.libXi - xorg.libXext - xorg.libXxf86vm + libx11 + libxcursor + libxrandr + libxinerama + libxi + libxext + libxxf86vm libglvnd ]; diff --git a/pkgs/by-name/go/gobble/package.nix b/pkgs/by-name/go/gobble/package.nix index 31d3a75a3b76..fed8ce67400f 100644 --- a/pkgs/by-name/go/gobble/package.nix +++ b/pkgs/by-name/go/gobble/package.nix @@ -2,7 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - xorg, + libxcb, installShellFiles, pandoc, }: @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-DnIZTeRyxhmVK2uB21ScPiEyL4k9kAWfVoLNIAM9P68="; - buildInputs = [ xorg.libxcb ]; + buildInputs = [ libxcb ]; nativeBuildInputs = [ pandoc installShellFiles diff --git a/pkgs/by-name/go/gohufont/package.nix b/pkgs/by-name/go/gohufont/package.nix index 8f16374282d8..ca646bc54a47 100644 --- a/pkgs/by-name/go/gohufont/package.nix +++ b/pkgs/by-name/go/gohufont/package.nix @@ -2,7 +2,8 @@ lib, stdenv, fetchFromGitHub, - xorg, + mkfontscale, + fonttosfnt, bdf2psf, bdftopcf, libfaketime, @@ -20,10 +21,10 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - xorg.mkfontscale + mkfontscale bdf2psf bdftopcf - xorg.fonttosfnt + fonttosfnt libfaketime ]; diff --git a/pkgs/by-name/go/gomanagedocker/package.nix b/pkgs/by-name/go/gomanagedocker/package.nix index d370035add3b..508bd2b10460 100644 --- a/pkgs/by-name/go/gomanagedocker/package.nix +++ b/pkgs/by-name/go/gomanagedocker/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, versionCheckHook, nix-update-script, - xorg, + libx11, pkg-config, gpgme, btrfs-progs, @@ -34,7 +34,7 @@ buildGoModule { gpgme btrfs-progs ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libx11 ]; ldflags = [ "-s" diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix index 4dc2d43a85a9..b133c02dceb8 100644 --- a/pkgs/by-name/go/goose-cli/package.nix +++ b/pkgs/by-name/go/goose-cli/package.nix @@ -5,7 +5,7 @@ fetchurl, rustPlatform, dbus, - xorg, + libxcb, pkg-config, protobuf, openssl, @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { dbus openssl ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libxcb ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; env.LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix index 44901b00999f..e4ea8996db4d 100644 --- a/pkgs/by-name/gp/gpac/package.nix +++ b/pkgs/by-name/gp/gpac/package.nix @@ -29,7 +29,9 @@ pulseaudio, SDL2, curl, - xorg, + libxv, + libx11, + xorgproto, withFullDeps ? false, withFfmpeg ? withFullDeps, @@ -108,9 +110,9 @@ stdenv.mkDerivation (finalAttrs: { nghttp2 openjpeg libcaca - xorg.libX11 - xorg.libXv - xorg.xorgproto + libx11 + libxv + xorgproto mesa mesa_glu xvidcore diff --git a/pkgs/by-name/gr/grail/package.nix b/pkgs/by-name/gr/grail/package.nix index 93a3bd282d96..b7d13c2bc205 100644 --- a/pkgs/by-name/gr/grail/package.nix +++ b/pkgs/by-name/gr/grail/package.nix @@ -4,7 +4,11 @@ stdenv, fetchurl, pkg-config, - xorg, + libxtst, + libxi, + libxfixes, + libxext, + libx11, python3, frame, }: @@ -24,11 +28,11 @@ stdenv.mkDerivation rec { frame ] ++ lib.optionals enableX11 [ - xorg.libX11 - xorg.libXtst - xorg.libXext - xorg.libXi - xorg.libXfixes + libx11 + libxtst + libxext + libxi + libxfixes ]; configureFlags = lib.optional enableX11 "--with-x11"; diff --git a/pkgs/by-name/gr/graphite/package.nix b/pkgs/by-name/gr/graphite/package.nix index f523b0b924f4..aec9910cbbc6 100644 --- a/pkgs/by-name/gr/graphite/package.nix +++ b/pkgs/by-name/gr/graphite/package.nix @@ -25,7 +25,9 @@ vulkan-loader, libGL, libxkbcommon, - xorg, + libxcursor, + libx11, + libxcb, }: let @@ -123,9 +125,9 @@ let wayland openssl libxkbcommon - xorg.libXcursor - xorg.libxcb - xorg.libX11 + libxcursor + libxcb + libx11 ]; cef = cef-binary.overrideAttrs { postFixup = '' diff --git a/pkgs/by-name/gr/grayjay/package.nix b/pkgs/by-name/gr/grayjay/package.nix index 002c5c3fa223..877fa35e238b 100644 --- a/pkgs/by-name/gr/grayjay/package.nix +++ b/pkgs/by-name/gr/grayjay/package.nix @@ -7,7 +7,13 @@ libz, icu, openssl, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxcb, gtk3, glib, nss, @@ -69,7 +75,7 @@ buildDotnetModule (finalAttrs: { buildInputs = [ openssl libgcc - xorg.libX11 + libx11 gtk3 glib alsa-lib @@ -155,12 +161,12 @@ buildDotnetModule (finalAttrs: { runtimeDeps = [ libz - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxcb dbus atk diff --git a/pkgs/by-name/gr/gromit-mpx/package.nix b/pkgs/by-name/gr/gromit-mpx/package.nix index 48b28dbb356f..fcd3148602a3 100644 --- a/pkgs/by-name/gr/gromit-mpx/package.nix +++ b/pkgs/by-name/gr/gromit-mpx/package.nix @@ -8,7 +8,7 @@ glib, libappindicator-gtk3, libpthreadstubs, - xorg, + libxdmcp, libxkbcommon, libepoxy, at-spi2-core, @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { glib libappindicator-gtk3 libpthreadstubs - xorg.libXdmcp + libxdmcp libxkbcommon libepoxy at-spi2-core diff --git a/pkgs/by-name/gt/gtk3/package.nix b/pkgs/by-name/gt/gtk3/package.nix index f3afefdbdc23..1037bdd50e65 100644 --- a/pkgs/by-name/gt/gtk3/package.nix +++ b/pkgs/by-name/gt/gtk3/package.nix @@ -29,7 +29,16 @@ && stdenv.hostPlatform.emulatorAvailable buildPackages, compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages, fribidi, - xorg, + libxrender, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxdamage, + libxcursor, + libxcomposite, + libsm, + libice, libepoxy, libxkbcommon, libxml2, @@ -162,15 +171,15 @@ stdenv.mkDerivation (finalAttrs: { gsettings-desktop-schemas ] ++ lib.optionals x11Support [ - xorg.libICE - xorg.libSM - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender + libice + libsm + libxcomposite + libxcursor + libxdamage + libxfixes + libxi + libxrandr + libxrender ] ++ [ # TODO: Reorder me on `staging`. @@ -182,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols ] ++ lib.optionals xineramaSupport [ - xorg.libXinerama + libxinerama ] ++ lib.optionals cupsSupport [ cups diff --git a/pkgs/by-name/gt/gtk4/package.nix b/pkgs/by-name/gt/gtk4/package.nix index 7d74b997b659..1c4f88ccb9f5 100644 --- a/pkgs/by-name/gt/gtk4/package.nix +++ b/pkgs/by-name/gt/gtk4/package.nix @@ -24,7 +24,14 @@ gobject-introspection, fribidi, harfbuzz, - xorg, + libxrender, + libxrandr, + libxi, + libxinerama, + libxdamage, + libxcursor, + libsm, + libice, libepoxy, libxkbcommon, libpng, @@ -141,13 +148,13 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-plugins-bad fribidi harfbuzz - xorg.libICE - xorg.libSM - xorg.libXcursor - xorg.libXdamage - xorg.libXi - xorg.libXrandr - xorg.libXrender + libice + libsm + libxcursor + libxdamage + libxi + libxrandr + libxrender ] ++ lib.optionals trackerSupport [ tinysparql @@ -158,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols ] ++ lib.optionals xineramaSupport [ - xorg.libXinerama + libxinerama ] ++ lib.optionals cupsSupport [ cups diff --git a/pkgs/by-name/gw/gwyddion/package.nix b/pkgs/by-name/gw/gwyddion/package.nix index 6f7b969aa0c4..f092370b80da 100644 --- a/pkgs/by-name/gw/gwyddion/package.nix +++ b/pkgs/by-name/gw/gwyddion/package.nix @@ -17,7 +17,7 @@ libwebp, # libXmu is not used if libunique is. libXmuSupport ? false, - xorg, + libxmu, libxsltSupport ? true, libxslt, fitsSupport ? true, @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { libGL ] ++ lib.optional openexrSupport openexr - ++ lib.optional libXmuSupport xorg.libXmu + ++ lib.optional libXmuSupport libxmu ++ lib.optional fitsSupport cfitsio ++ lib.optional libpngSupport libpng ++ lib.optional libxsltSupport libxslt diff --git a/pkgs/by-name/gx/gxmatcheq-lv2/package.nix b/pkgs/by-name/gx/gxmatcheq-lv2/package.nix index b05b5516b651..a687a0e2c1bb 100644 --- a/pkgs/by-name/gx/gxmatcheq-lv2/package.nix +++ b/pkgs/by-name/gx/gxmatcheq-lv2/package.nix @@ -3,7 +3,7 @@ stdenv, gcc13Stdenv, fetchFromGitHub, - xorg, + libx11, xorgproto, cairo, lv2, @@ -27,7 +27,7 @@ buildStdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 xorgproto cairo lv2 diff --git a/pkgs/by-name/gx/gxplugins-lv2/package.nix b/pkgs/by-name/gx/gxplugins-lv2/package.nix index 47a51da77ec6..1113c158c481 100644 --- a/pkgs/by-name/gx/gxplugins-lv2/package.nix +++ b/pkgs/by-name/gx/gxplugins-lv2/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libx11, xorgproto, cairo, lv2, @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 xorgproto cairo lv2 diff --git a/pkgs/by-name/ha/hakuneko/package.nix b/pkgs/by-name/ha/hakuneko/package.nix index 14af708e1c83..06aad1b99b05 100644 --- a/pkgs/by-name/ha/hakuneko/package.nix +++ b/pkgs/by-name/ha/hakuneko/package.nix @@ -12,7 +12,8 @@ nss, nspr, systemd, - xorg, + libxtst, + libxscrnsaver, }: let desktopItem = makeDesktopItem { @@ -61,8 +62,8 @@ stdenv.mkDerivation rec { alsa-lib nss nspr - xorg.libXScrnSaver - xorg.libXtst + libxscrnsaver + libxtst systemd ]; diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix index cff0316ca521..027865351458 100644 --- a/pkgs/by-name/ha/halloy/package.nix +++ b/pkgs/by-name/ha/halloy/package.nix @@ -12,7 +12,10 @@ rustPlatform, vulkan-loader, wayland, - xorg, + libxi, + libxcursor, + libx11, + libxcb, alsa-lib, }: @@ -43,10 +46,10 @@ rustPlatform.buildRustPackage rec { libxkbcommon vulkan-loader wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libxcb + libx11 + libxcursor + libxi + libxcb ]; desktopItems = [ diff --git a/pkgs/by-name/he/helio-workstation/package.nix b/pkgs/by-name/he/helio-workstation/package.nix index 07108a2c222b..ce0ab0ec5a6b 100644 --- a/pkgs/by-name/he/helio-workstation/package.nix +++ b/pkgs/by-name/he/helio-workstation/package.nix @@ -4,7 +4,12 @@ fetchFromGitHub, alsa-lib, freetype, - xorg, + libxrandr, + libxinerama, + libxext, + libxcursor, + libxcomposite, + libx11, curl, libGL, libjack2, @@ -28,12 +33,12 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib freetype - xorg.libX11 - xorg.libXext - xorg.libXinerama - xorg.libXrandr - xorg.libXcursor - xorg.libXcomposite + libx11 + libxext + libxinerama + libxrandr + libxcursor + libxcomposite curl libGL libjack2 diff --git a/pkgs/by-name/he/helm/package.nix b/pkgs/by-name/he/helm/package.nix index 0919ddef6bf0..96c3fa7b7457 100644 --- a/pkgs/by-name/he/helm/package.nix +++ b/pkgs/by-name/he/helm/package.nix @@ -3,7 +3,13 @@ stdenv, fetchFromGitHub, fetchpatch, - xorg, + libxrender, + libxrandr, + libxinerama, + libxext, + libxcursor, + libxcomposite, + libx11, freetype, alsa-lib, curl, @@ -26,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXext - xorg.libXinerama - xorg.libXrender - xorg.libXrandr + libx11 + libxcomposite + libxcursor + libxext + libxinerama + libxrender + libxrandr freetype alsa-lib curl diff --git a/pkgs/by-name/he/hey-mail/package.nix b/pkgs/by-name/he/hey-mail/package.nix index 472c5fc80dfe..c9864f6a7dad 100644 --- a/pkgs/by-name/he/hey-mail/package.nix +++ b/pkgs/by-name/he/hey-mail/package.nix @@ -30,7 +30,17 @@ gdk-pixbuf, pango, cairo, - xorg, + libxtst, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, ffmpeg, http-parser, nss, @@ -62,17 +72,17 @@ let gdk-pixbuf pango cairo - xorg.libxcb - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrender - xorg.libXtst - xorg.libXrandr + libxcb + libx11 + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrender + libxtst + libxrandr ffmpeg http-parser nss diff --git a/pkgs/by-name/hh/hhpc/package.nix b/pkgs/by-name/hh/hhpc/package.nix index af81dc16b893..b0eb04ec6b3f 100644 --- a/pkgs/by-name/hh/hhpc/package.nix +++ b/pkgs/by-name/hh/hhpc/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libx11, pkg-config, }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/by-name/hi/highlight-pointer/package.nix b/pkgs/by-name/hi/highlight-pointer/package.nix index 5facf4b096eb..d65dfc7a81e2 100644 --- a/pkgs/by-name/hi/highlight-pointer/package.nix +++ b/pkgs/by-name/hi/highlight-pointer/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, libX11, - xorg, + libxi, + libxfixes, libXext, }: @@ -21,8 +22,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libX11 libXext - xorg.libXi - xorg.libXfixes + libxi + libxfixes ]; installPhase = '' diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index 12b4f490c425..6958fc4ad4b1 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -23,7 +23,13 @@ hmclJdk jdk17 ], - xorg, + libxxf86vm, + libxtst, + libxrandr, + libxext, + libxcursor, + libx11, + xrandr, glib, libGL, glfw, @@ -138,12 +144,12 @@ stdenv.mkDerivation (finalAttrs: { vulkan-loader ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - xorg.libXxf86vm - xorg.libXext - xorg.libXcursor - xorg.libXrandr - xorg.libXtst + libx11 + libxxf86vm + libxext + libxcursor + libxrandr + libxtst libpulseaudio wayland alsa-lib @@ -177,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { --add-flags "-jar $out/lib/hmcl/hmcl-terracotta-patch.jar" \ --set LD_LIBRARY_PATH ${lib.makeLibraryPath finalAttrs.runtimeDeps} \ --prefix PATH : "${ - lib.makeBinPath (minecraftJdks ++ lib.optional stdenv.hostPlatform.isLinux xorg.xrandr) + lib.makeBinPath (minecraftJdks ++ lib.optional stdenv.hostPlatform.isLinux xrandr) }" \ --run 'cd $HOME' \ ''${gappsWrapperArgs[@]} diff --git a/pkgs/by-name/ho/houdini/package.nix b/pkgs/by-name/ho/houdini/package.nix index 0b9b1e4b9fb2..7d74e20b19d3 100644 --- a/pkgs/by-name/ho/houdini/package.nix +++ b/pkgs/by-name/ho/houdini/package.nix @@ -42,32 +42,32 @@ buildFHSEnv { ocl-icd # needed for opencl numactl # needed by hfs ocl backend zstd # needed from 20.0 - xorg.libICE - xorg.libSM - xorg.libXmu - xorg.libXi - xorg.libXt - xorg.libXext - xorg.libX11 - xorg.libXrender - xorg.libXcursor - xorg.libXfixes - xorg.libXrender - xorg.libXcomposite - xorg.libXdamage - xorg.libXtst - xorg.libxcb - xorg.libXScrnSaver - xorg.libXrandr - xorg.libxcb - xorg.libxkbfile - xorg.libxshmfence - xorg.xcbutil - xorg.xcbutilimage - xorg.xcbutilrenderutil - xorg.xcbutilcursor - xorg.xcbutilkeysyms - xorg.xcbutilwm + libice + libsm + libxmu + libxi + libxt + libxext + libx11 + libxrender + libxcursor + libxfixes + libxrender + libxcomposite + libxdamage + libxtst + libxcb + libxscrnsaver + libxrandr + libxcb + libxkbfile + libxshmfence + libxcb-util + libxcb-image + libxcb-render-util + libxcb-cursor + libxcb-keysyms + libxcb-wm ]; passthru = { diff --git a/pkgs/by-name/ho/hover/package.nix b/pkgs/by-name/ho/hover/package.nix index 49e326d6edc4..90de28ebf09e 100644 --- a/pkgs/by-name/ho/hover/package.nix +++ b/pkgs/by-name/ho/hover/package.nix @@ -7,7 +7,16 @@ pkg-config, fetchFromGitHub, roboto, - xorg, + libxxf86vm, + libxrender, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxext, + libxcursor, + libx11, + xorgproto, libglvnd, addDriverRunpath, makeWrapper, @@ -21,17 +30,17 @@ let version = "0.47.2"; libs = [ - xorg.libX11.dev - xorg.libXcursor.dev - xorg.libXext.dev - xorg.libXi.dev - xorg.libXinerama.dev - xorg.libXrandr.dev - xorg.libXrender.dev - xorg.libXfixes.dev - xorg.libXxf86vm + libx11.dev + libxcursor.dev + libxext.dev + libxi.dev + libxinerama.dev + libxrandr.dev + libxrender.dev + libxfixes.dev + libxxf86vm libglvnd.dev - xorg.xorgproto + xorgproto ]; hover = buildGoModule { inherit pname version; diff --git a/pkgs/by-name/ht/hterm/package.nix b/pkgs/by-name/ht/hterm/package.nix index 7b66584be0fd..bbd8e1d918a2 100644 --- a/pkgs/by-name/ht/hterm/package.nix +++ b/pkgs/by-name/ht/hterm/package.nix @@ -8,7 +8,7 @@ expat, fontconfig, gtk2, - xorg, + libsm, autoPatchelfHook, }: stdenv.mkDerivation (finalAttrs: { @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { expat fontconfig.lib gtk2 - xorg.libSM + libsm ]; installPhase = '' diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 6702a0df4186..83fe0baa38bc 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -38,7 +38,11 @@ wayland, wayland-protocols, wayland-scanner, - xorg, + libxcb-wm, + libxcb-errors, + libxdmcp, + libxcursor, + libxcb, xwayland, debug ? false, enableXWayland ? true, @@ -173,15 +177,15 @@ customStdenv.mkDerivation (finalAttrs: { tomlplusplus wayland wayland-protocols - xorg.libXcursor + libxcursor ] (optionals customStdenv.hostPlatform.isBSD [ epoll-shim ]) (optionals customStdenv.hostPlatform.isMusl [ libexecinfo ]) (optionals enableXWayland [ - xorg.libxcb - xorg.libXdmcp - xorg.xcbutilerrors - xorg.xcbutilwm + libxcb + libxdmcp + libxcb-errors + libxcb-wm xwayland ]) (optionals withSystemd [ systemd ]) diff --git a/pkgs/by-name/id/ida-free/package.nix b/pkgs/by-name/id/ida-free/package.nix index ab78ed059636..f7bc54417795 100644 --- a/pkgs/by-name/id/ida-free/package.nix +++ b/pkgs/by-name/id/ida-free/package.nix @@ -17,7 +17,19 @@ makeWrapper, openssl, stdenv, - xorg, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxcb-cursor, + libxrender, + libxi, + libxext, + libxau, + libx11, + libsm, + libice, + libxcb, zlib, }: stdenv.mkDerivation (finalAttrs: rec { @@ -54,19 +66,19 @@ stdenv.mkDerivation (finalAttrs: rec { libxkbcommon openssl stdenv.cc.cc - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXau - xorg.libxcb - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - xorg.xcbutilcursor + libice + libsm + libx11 + libxau + libxcb + libxext + libxi + libxrender + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-wm + libxcb-cursor zlib ]; buildInputs = runtimeDependencies; diff --git a/pkgs/by-name/id/ideogram/package.nix b/pkgs/by-name/id/ideogram/package.nix index ac7d171cfc40..7cb5784d2640 100644 --- a/pkgs/by-name/id/ideogram/package.nix +++ b/pkgs/by-name/id/ideogram/package.nix @@ -13,7 +13,8 @@ libgee, pantheon, desktop-file-utils, - xorg, + libxtst, + libx11, wrapGAppsHook3, }: @@ -43,8 +44,8 @@ stdenv.mkDerivation rec { gtk3 libgee pantheon.granite - xorg.libX11 - xorg.libXtst + libx11 + libxtst ]; postPatch = '' diff --git a/pkgs/by-name/im/imlib2/package.nix b/pkgs/by-name/im/imlib2/package.nix index 2614dc6c9151..c20a777b9a27 100644 --- a/pkgs/by-name/im/imlib2/package.nix +++ b/pkgs/by-name/im/imlib2/package.nix @@ -32,7 +32,8 @@ openbox, fluxbox, enlightenment, - xorg, + libxft, + libxext, testers, gitUpdater, @@ -60,8 +61,8 @@ stdenv.mkDerivation (finalAttrs: { libid3tag ] ++ optionals x11Support [ - xorg.libXft - xorg.libXext + libxft + libxext ] ++ optional heifSupport libheif ++ optional svgSupport librsvg diff --git a/pkgs/by-name/im/immersed/linux.nix b/pkgs/by-name/im/immersed/linux.nix index dda4ed55adae..36b46c4c8916 100644 --- a/pkgs/by-name/im/immersed/linux.nix +++ b/pkgs/by-name/im/immersed/linux.nix @@ -38,8 +38,8 @@ appimageTools.wrapAppImage { e2fsprogs zlib libp11 - xorg.libX11 - xorg.libSM + libx11 + libsm ]; multiArch = true; diff --git a/pkgs/by-name/im/imnodes/package.nix b/pkgs/by-name/im/imnodes/package.nix index d7fae28fd0db..aece5ddd1f37 100644 --- a/pkgs/by-name/im/imnodes/package.nix +++ b/pkgs/by-name/im/imnodes/package.nix @@ -6,7 +6,7 @@ cmake, imgui, SDL2, - xorg, + libxext, imnodes, withExamples ? false, }: @@ -39,7 +39,7 @@ stdenv.mkDerivation { ] ++ lib.optionals withExamples [ SDL2 - xorg.libXext + libxext ]; cmakeFlags = [ (lib.cmakeBool "IMNODES_EXAMPLES" withExamples) ]; diff --git a/pkgs/by-name/im/imv/package.nix b/pkgs/by-name/im/imv/package.nix index 18d4da04410f..d4f29d00972e 100644 --- a/pkgs/by-name/im/imv/package.nix +++ b/pkgs/by-name/im/imv/package.nix @@ -14,7 +14,8 @@ pango, inih, withWindowSystem ? if stdenv.hostPlatform.isLinux then "all" else "x11", - xorg, + libx11, + libxcb, libxkbcommon, libGL, wayland, @@ -50,8 +51,8 @@ let windowSystems = { all = windowSystems.x11 ++ windowSystems.wayland; x11 = [ - xorg.libxcb - xorg.libX11 + libxcb + libx11 ]; wayland = [ wayland diff --git a/pkgs/by-name/in/inlyne/package.nix b/pkgs/by-name/in/inlyne/package.nix index d703194effe9..bbfe5db25c18 100644 --- a/pkgs/by-name/in/inlyne/package.nix +++ b/pkgs/by-name/in/inlyne/package.nix @@ -6,7 +6,11 @@ stdenv, pkg-config, fontconfig, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, + libxcb, libxkbcommon, wayland, libGL, @@ -36,10 +40,10 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ fontconfig - xorg.libXcursor - xorg.libXi - xorg.libXrandr - xorg.libxcb + libxcursor + libxi + libxrandr + libxcb wayland libxkbcommon openssl @@ -71,7 +75,7 @@ rustPlatform.buildRustPackage rec { --add-rpath ${ lib.makeLibraryPath [ libGL - xorg.libX11 + libx11 ] } ''; diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index 52cd47569f68..436d8648805b 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -4,7 +4,7 @@ fetchurl, dpkg, libuuid, - xorg, + libx11, curlMinimal, openssl_3, libsecret, @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { intune = lib.makeLibraryPath [ stdenv.cc.cc libuuid - xorg.libX11 + libx11 curlMinimal_openssl_3 openssl_3 libsecret diff --git a/pkgs/by-name/in/inxi/package.nix b/pkgs/by-name/in/inxi/package.nix index fb1a57a369be..1ca7af8652f9 100644 --- a/pkgs/by-name/in/inxi/package.nix +++ b/pkgs/by-name/in/inxi/package.nix @@ -25,7 +25,9 @@ pciutils, withRecommendedDisplayInformationPrograms ? withRecommends, mesa-demos, - xorg, + xrandr, + xprop, + xdpyinfo, }: let @@ -48,9 +50,9 @@ let ]; recommendedDisplayInformationPrograms = lib.optionals withRecommendedDisplayInformationPrograms [ mesa-demos - xorg.xdpyinfo - xorg.xprop - xorg.xrandr + xdpyinfo + xprop + xrandr ]; programs = [ ps diff --git a/pkgs/by-name/ip/ipmiview/package.nix b/pkgs/by-name/ip/ipmiview/package.nix index c202e0fac5bf..4761fd92fa96 100644 --- a/pkgs/by-name/ip/ipmiview/package.nix +++ b/pkgs/by-name/ip/ipmiview/package.nix @@ -11,7 +11,11 @@ gcc-unwrapped, iputils, psmisc, - xorg, + libxtst, + libxrender, + libxi, + libxext, + libx11, }: stdenv.mkDerivation rec { @@ -43,11 +47,11 @@ stdenv.mkDerivation rec { patchelf --set-rpath "${ lib.makeLibraryPath [ - xorg.libX11 - xorg.libXext - xorg.libXrender - xorg.libXtst - xorg.libXi + libx11 + libxext + libxrender + libxtst + libxi ] }" ./jre/lib/libawt_xawt.so patchelf --set-rpath "${lib.makeLibraryPath [ freetype ]}" ./jre/lib/libfontmanager.so diff --git a/pkgs/by-name/ip/ipscan/package.nix b/pkgs/by-name/ip/ipscan/package.nix index 9180269a4e4c..8497ae57c9cf 100644 --- a/pkgs/by-name/ip/ipscan/package.nix +++ b/pkgs/by-name/ip/ipscan/package.nix @@ -6,7 +6,7 @@ jre, swt, makeWrapper, - xorg, + libxtst, dpkg, gtk3, glib, @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix LD_LIBRARY_PATH : "$out/lib/:${ lib.makeLibraryPath [ swt - xorg.libXtst + libxtst gtk3 glib ] diff --git a/pkgs/by-name/is/isle-portable/package.nix b/pkgs/by-name/is/isle-portable/package.nix index 6cac3298d81a..b337c74dd618 100644 --- a/pkgs/by-name/is/isle-portable/package.nix +++ b/pkgs/by-name/is/isle-portable/package.nix @@ -10,7 +10,14 @@ pkg-config, # Build Inputs - xorg, + libxrender, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxext, + libxcursor, + libx11, wayland, libxkbcommon, wayland-protocols, @@ -62,14 +69,14 @@ stdenv.mkDerivation (finalAttrs: { iniparser ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - xorg.libXext - xorg.libXrandr - xorg.libXrender - xorg.libXfixes - xorg.libXi - xorg.libXinerama - xorg.libXcursor + libx11 + libxext + libxrandr + libxrender + libxfixes + libxi + libxinerama + libxcursor wayland libxkbcommon wayland-protocols diff --git a/pkgs/by-name/jf/jfbview/package.nix b/pkgs/by-name/jf/jfbview/package.nix index 8d099de18acc..ff649a23ff6d 100644 --- a/pkgs/by-name/jf/jfbview/package.nix +++ b/pkgs/by-name/jf/jfbview/package.nix @@ -11,7 +11,7 @@ ncurses, openjpeg, zlib, - xorg, + libx11, cmake, }: @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { libjpeg ncurses openjpeg - xorg.libX11 + libx11 zlib ]; diff --git a/pkgs/by-name/jg/jgmenu/package.nix b/pkgs/by-name/jg/jgmenu/package.nix index ce599c2efc51..88b90bd0257d 100644 --- a/pkgs/by-name/jg/jgmenu/package.nix +++ b/pkgs/by-name/jg/jgmenu/package.nix @@ -9,7 +9,8 @@ libxfce4util, libxml2, menu-cache, - xorg, + libxrandr, + libxinerama, makeWrapper, enableXfcePanelApplet ? false, xfce4-panel, @@ -39,8 +40,8 @@ stdenv.mkDerivation rec { librsvg libxml2 menu-cache - xorg.libXinerama - xorg.libXrandr + libxinerama + libxrandr python3Packages.python ] ++ lib.optionals enableXfcePanelApplet [ diff --git a/pkgs/by-name/ji/jibri/package.nix b/pkgs/by-name/ji/jibri/package.nix index ba21f38becd8..a50fbede9a46 100644 --- a/pkgs/by-name/ji/jibri/package.nix +++ b/pkgs/by-name/ji/jibri/package.nix @@ -6,17 +6,18 @@ jdk11_headless, makeWrapper, writeText, - xorg, + xorg-server, + xf86-video-dummy, nixosTests, }: let xorgModulePaths = writeText "module-paths" '' Section "Files" - ModulePath "${xorg.xorgserver}/lib/xorg/modules - ModulePath "${xorg.xorgserver}/lib/xorg/extensions - ModulePath "${xorg.xorgserver}/lib/xorg/drivers - ModulePath "${xorg.xf86videodummy}/lib/xorg/modules/drivers + ModulePath "${xorg-server}/lib/xorg/modules + ModulePath "${xorg-server}/lib/xorg/extensions + ModulePath "${xorg-server}/lib/xorg/drivers + ModulePath "${xf86-video-dummy}/lib/xorg/modules/drivers EndSection ''; diff --git a/pkgs/by-name/ji/jitsi/package.nix b/pkgs/by-name/ji/jitsi/package.nix index f10caa8b259f..1f7048158088 100644 --- a/pkgs/by-name/ji/jitsi/package.nix +++ b/pkgs/by-name/ji/jitsi/package.nix @@ -12,7 +12,10 @@ gtk2, libpulseaudio, openssl, - xorg, + libxv, + libxscrnsaver, + libxext, + libx11, }: let @@ -47,10 +50,10 @@ stdenv.mkDerivation rec { gtk2 libpulseaudio openssl - xorg.libX11 - xorg.libXext - xorg.libXScrnSaver - xorg.libXv + libx11 + libxext + libxscrnsaver + libxv ]; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/by-name/jo/jogl/package.nix b/pkgs/by-name/jo/jogl/package.nix index 06be6562a899..6c09360c2c47 100644 --- a/pkgs/by-name/jo/jogl/package.nix +++ b/pkgs/by-name/jo/jogl/package.nix @@ -9,7 +9,13 @@ stripJavaArchivesHook, xcbuild, udev, - xorg, + libxxf86vm, + libxt, + libxrender, + libxrandr, + libxi, + libxcursor, + libx11, libgbm, coreutils, }: @@ -77,13 +83,13 @@ stdenv.mkDerivation { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ udev - xorg.libX11 - xorg.libXrandr - xorg.libXcursor - xorg.libXi - xorg.libXt - xorg.libXxf86vm - xorg.libXrender + libx11 + libxrandr + libxcursor + libxi + libxt + libxxf86vm + libxrender libgbm ]; diff --git a/pkgs/by-name/js/jstest-gtk/package.nix b/pkgs/by-name/js/jstest-gtk/package.nix index 396c445343d7..ba476a2b6b81 100644 --- a/pkgs/by-name/js/jstest-gtk/package.nix +++ b/pkgs/by-name/js/jstest-gtk/package.nix @@ -6,7 +6,7 @@ pkg-config, gtkmm3, libsigcxx, - xorg, + libx11, }: stdenv.mkDerivation { @@ -27,7 +27,7 @@ stdenv.mkDerivation { buildInputs = [ gtkmm3 libsigcxx - xorg.libX11 + libx11 ]; meta = { diff --git a/pkgs/by-name/ju/jumpy/package.nix b/pkgs/by-name/ju/jumpy/package.nix index 528bc3e1de29..aa110337c81b 100644 --- a/pkgs/by-name/ju/jumpy/package.nix +++ b/pkgs/by-name/ju/jumpy/package.nix @@ -12,7 +12,10 @@ udev, vulkan-loader, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -50,10 +53,10 @@ rustPlatform.buildRustPackage (finalAttrs: { udev vulkan-loader wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix index 37f5224b0e78..e82f304c7dc2 100644 --- a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix +++ b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix @@ -13,7 +13,7 @@ libxcb, lv2, xcbutilwm, - xorg, + libxcb-util, zita-convolver, zita-resampler, }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libxcb lv2 xcbutilwm - xorg.xcbutil + libxcb-util zita-convolver zita-resampler ]; diff --git a/pkgs/by-name/kb/kbdd/package.nix b/pkgs/by-name/kb/kbdd/package.nix index 55278a459455..e83b8864ba0f 100644 --- a/pkgs/by-name/kb/kbdd/package.nix +++ b/pkgs/by-name/kb/kbdd/package.nix @@ -5,7 +5,7 @@ pkg-config, dbus-glib, autoreconfHook, - xorg, + libx11, }: stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 dbus-glib ]; diff --git a/pkgs/by-name/kb/kbt/package.nix b/pkgs/by-name/kb/kbt/package.nix index f499a9f6cb6d..45408c8a6537 100644 --- a/pkgs/by-name/kb/kbt/package.nix +++ b/pkgs/by-name/kb/kbt/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, stdenv, pkg-config, - xorg, + libx11, }: rustPlatform.buildRustPackage rec { @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 + libx11 ]; meta = { diff --git a/pkgs/by-name/kd/kdash/package.nix b/pkgs/by-name/kd/kdash/package.nix index fffee971aa87..ad2de8193f0b 100644 --- a/pkgs/by-name/kd/kdash/package.nix +++ b/pkgs/by-name/kd/kdash/package.nix @@ -6,7 +6,7 @@ perl, python3, openssl, - xorg, + libxcb-util, }: rustPlatform.buildRustPackage rec { @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - xorg.xcbutil + libxcb-util ]; # Fix for build failure with gcc15 diff --git a/pkgs/by-name/ke/keepass/package.nix b/pkgs/by-name/ke/keepass/package.nix index e889991fbcb6..73a02c9059dd 100644 --- a/pkgs/by-name/ke/keepass/package.nix +++ b/pkgs/by-name/ke/keepass/package.nix @@ -8,7 +8,7 @@ icoutils, replaceVars, xsel, - xorg, + xprop, xdotool, coreutils, unixtools, @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (replaceVars ./fix-paths.patch { xsel = "${xsel}/bin/xsel"; - xprop = "${xorg.xprop}/bin/xprop"; + xprop = "${xprop}/bin/xprop"; xdotool = "${xdotool}/bin/xdotool"; uname = "${coreutils}/bin/uname"; whereis = "${unixtools.whereis}/bin/whereis"; diff --git a/pkgs/by-name/ke/keyboard-layout-editor/package.nix b/pkgs/by-name/ke/keyboard-layout-editor/package.nix index babab710e0b6..3c59c1790a13 100644 --- a/pkgs/by-name/ke/keyboard-layout-editor/package.nix +++ b/pkgs/by-name/ke/keyboard-layout-editor/package.nix @@ -6,7 +6,7 @@ makeBinaryWrapper, openjdk, wrapGAppsHook3, - xorg, + xkbcomp, }: let @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { cp build/libs/keyboard-layout-editor-all-1.0-SNAPSHOT.jar $out/share/java/keyboard-layout-editor.jar mkdir -p $out/bin makeWrapper ${lib.getExe jdk} $out/bin/keyboard-layout-editor \ - --prefix PATH : ${lib.makeBinPath [ xorg.xkbcomp ]} \ + --prefix PATH : ${lib.makeBinPath [ xkbcomp ]} \ --add-flags "--add-opens=javafx.graphics/com.sun.prism=ALL-UNNAMED" \ --add-flags "--add-opens=javafx.graphics/com.sun.javafx.font=ALL-UNNAMED" \ --add-flags "--add-opens=javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED" \ diff --git a/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix b/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix index 4e95dfb48470..265bbce0997a 100644 --- a/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix +++ b/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix @@ -5,7 +5,14 @@ libGL, nssmdns, pkg-config, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxext, + libxcursor, + libx11, + xinput, }: buildGoModule rec { @@ -28,15 +35,15 @@ buildGoModule rec { buildInputs = [ libGL nssmdns - xorg.libX11 - xorg.libX11.dev - xorg.libXcursor - xorg.libXext - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.libXxf86vm - xorg.xinput + libx11 + libx11.dev + libxcursor + libxext + libxi + libxinerama + libxrandr + libxxf86vm + xinput ]; meta = { diff --git a/pkgs/by-name/ki/kime/package.nix b/pkgs/by-name/ki/kime/package.nix index e426b3f45bec..c97167e898fb 100644 --- a/pkgs/by-name/ki/kime/package.nix +++ b/pkgs/by-name/ki/kime/package.nix @@ -13,7 +13,7 @@ dbus, libdbusmenu, withXim ? true, - xorg, + libxcb, cairo, withGtk3 ? true, gtk3, @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { libdbusmenu ] ++ lib.optionals withXim [ - xorg.libxcb + libxcb cairo ] ++ lib.optionals withGtk3 [ gtk3 ] diff --git a/pkgs/by-name/ki/kingstvis/package.nix b/pkgs/by-name/ki/kingstvis/package.nix index e5d310405a49..327e47d697f8 100644 --- a/pkgs/by-name/ki/kingstvis/package.nix +++ b/pkgs/by-name/ki/kingstvis/package.nix @@ -8,7 +8,13 @@ lib, libGL, xkeyboard_config, - xorg, + libxrender, + libxi, + libxext, + libx11, + libsm, + libice, + libxcb, zlib, }: @@ -31,13 +37,13 @@ buildFHSEnv { glib libGL xkeyboard_config - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libxcb + libice + libsm + libx11 + libxext + libxi + libxrender + libxcb zlib ]; diff --git a/pkgs/by-name/ki/kirsch/package.nix b/pkgs/by-name/ki/kirsch/package.nix index e4a70e92ff86..7999eeb34d0b 100644 --- a/pkgs/by-name/ki/kirsch/package.nix +++ b/pkgs/by-name/ki/kirsch/package.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchzip, - xorg, + mkfontscale, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-olm6Q6xcfSEeWXToAs/kse9QNH8k87i8vaPblU6ICnk="; }; - nativeBuildInputs = [ xorg.mkfontscale ]; + nativeBuildInputs = [ mkfontscale ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/kn/knobkraft-orm/package.nix b/pkgs/by-name/kn/knobkraft-orm/package.nix index c33071a73b34..f7b000d1c12f 100644 --- a/pkgs/by-name/kn/knobkraft-orm/package.nix +++ b/pkgs/by-name/kn/knobkraft-orm/package.nix @@ -23,7 +23,8 @@ libsepol, libthai, libdatrie, - xorg, + libxtst, + libxdmcp, lerc, libxkbcommon, libepoxy, @@ -71,11 +72,11 @@ stdenv.mkDerivation (finalAttrs: { libsepol libthai libdatrie - xorg.libXdmcp + libxdmcp lerc libxkbcommon libepoxy - xorg.libXtst + libxtst sqlite git libdeflate diff --git a/pkgs/by-name/kr/krillinai/package.nix b/pkgs/by-name/kr/krillinai/package.nix index 44f7bc7024da..e4225de0c790 100644 --- a/pkgs/by-name/kr/krillinai/package.nix +++ b/pkgs/by-name/kr/krillinai/package.nix @@ -4,7 +4,12 @@ buildGoModule, fetchFromGitHub, pkg-config, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, libGL, nix-update-script, }: @@ -25,12 +30,12 @@ buildGoModule (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libXinerama - xorg.libXxf86vm - xorg.libXcursor - xorg.libXrandr - xorg.libX11 - xorg.libXi + libxinerama + libxxf86vm + libxcursor + libxrandr + libx11 + libxi libGL ]; diff --git a/pkgs/by-name/la/lapce/package.nix b/pkgs/by-name/la/lapce/package.nix index bd9e066f8762..5c0c156e0518 100644 --- a/pkgs/by-name/la/lapce/package.nix +++ b/pkgs/by-name/la/lapce/package.nix @@ -17,18 +17,23 @@ wrapGAppsHook3, wayland, gobject-introspection, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxcursor, + libx11, + libxcb, }: let rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [ libGL libxkbcommon - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr - xorg.libXxf86vm - xorg.libxcb + libx11 + libxcursor + libxi + libxrandr + libxxf86vm + libxcb wayland ]; in diff --git a/pkgs/by-name/la/lattice-diamond/package.nix b/pkgs/by-name/la/lattice-diamond/package.nix index 462101b67a30..cd312bcb928c 100644 --- a/pkgs/by-name/la/lattice-diamond/package.nix +++ b/pkgs/by-name/la/lattice-diamond/package.nix @@ -10,7 +10,12 @@ zlib, freetype, fontconfig, - xorg, + libxt, + libxrender, + libxext, + libx11, + libsm, + libice, libusb-compat-0_1, coreutils, }: @@ -123,12 +128,12 @@ stdenv.mkDerivation { zlib freetype fontconfig - xorg.libSM - xorg.libICE - xorg.libXrender - xorg.libXext - xorg.libX11 - xorg.libXt + libsm + libice + libxrender + libxext + libx11 + libxt libusb-compat-0_1 ]; diff --git a/pkgs/by-name/la/lazpaint/package.nix b/pkgs/by-name/la/lazpaint/package.nix index c15a99ee8946..bc0099f044cd 100644 --- a/pkgs/by-name/la/lazpaint/package.nix +++ b/pkgs/by-name/la/lazpaint/package.nix @@ -6,7 +6,7 @@ fpc, autoPatchelfHook, libsForQt5, - xorg, + libx11, python3, }: @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ]; runtimeDependencies = [ - xorg.libX11 + libx11 ]; preConfigure = '' diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index 5fe8ec84af49..bf3edc36ce0c 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, testers, lazysql, - xorg ? null, + libx11, darwin ? null, }: @@ -26,7 +26,7 @@ buildGoModule rec { "-X main.version=${version}" ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libx11 ]; passthru.tests.version = testers.testVersion { package = lazysql; diff --git a/pkgs/by-name/le/legends-of-equestria/package.nix b/pkgs/by-name/le/legends-of-equestria/package.nix index 3d2d4471e6af..4c1b58e89594 100644 --- a/pkgs/by-name/le/legends-of-equestria/package.nix +++ b/pkgs/by-name/le/legends-of-equestria/package.nix @@ -27,7 +27,18 @@ vulkan-loader, libasyncns, pango, - xorg, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxext, + libxdmcp, + libxcursor, + libxau, + libx11, + libxcb, wayland, }: @@ -66,18 +77,18 @@ let libGL vulkan-loader libasyncns - xorg.libX11 - xorg.libxcb - xorg.libXau - xorg.libXdmcp - xorg.libXext - xorg.libXcursor - xorg.libXrender - xorg.libXfixes - xorg.libXinerama - xorg.libXi - xorg.libXrandr - xorg.libXScrnSaver + libx11 + libxcb + libxau + libxdmcp + libxext + libxcursor + libxrender + libxfixes + libxinerama + libxi + libxrandr + libxscrnsaver ]; in stdenv.mkDerivation { diff --git a/pkgs/by-name/li/liana/package.nix b/pkgs/by-name/li/liana/package.nix index 8a9dba3b86b8..f49214263c9c 100644 --- a/pkgs/by-name/li/liana/package.nix +++ b/pkgs/by-name/li/liana/package.nix @@ -16,7 +16,10 @@ libxkbcommon, wayland, vulkan-loader, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, }: let @@ -31,10 +34,10 @@ let wayland libxkbcommon vulkan-loader - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ]; in rustPlatform.buildRustPackage rec { diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index bf5f9f89802a..05082cc8beda 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -7,7 +7,9 @@ wrapGAppsHook3, glew, gtk3, - xorg, + libxrandr, + libxi, + libxcursor, nix-update-script, }: @@ -47,9 +49,9 @@ buildDotnetModule rec { runtimeDeps = [ # For Avalonia UI glew - xorg.libXrandr - xorg.libXi - xorg.libXcursor + libxrandr + libxi + libxcursor # For file dialogs gtk3 ]; diff --git a/pkgs/by-name/li/libcaca/package.nix b/pkgs/by-name/li/libcaca/package.nix index 848f7c7d3060..d79906f49a86 100644 --- a/pkgs/by-name/li/libcaca/package.nix +++ b/pkgs/by-name/li/libcaca/package.nix @@ -4,7 +4,8 @@ fetchFromGitHub, autoreconfHook, imlib2, - xorg, + libxext, + libx11, ncurses, pkg-config, zlib, @@ -33,8 +34,8 @@ stdenv.mkDerivation rec { (imlib2.override { inherit x11Support; }) ] ++ lib.optionals x11Support [ - xorg.libX11 - xorg.libXext + libx11 + libxext ]; outputs = [ diff --git a/pkgs/by-name/li/libclxclient/package.nix b/pkgs/by-name/li/libclxclient/package.nix index bb15eb70e46e..6c1175caab5e 100644 --- a/pkgs/by-name/li/libclxclient/package.nix +++ b/pkgs/by-name/li/libclxclient/package.nix @@ -5,7 +5,7 @@ libclthreads, libX11, libXft, - xorg, + xorgproto, pkg-config, }: @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { libclthreads libX11 libXft - xorg.xorgproto + xorgproto ]; nativeBuildInputs = [ pkg-config ]; - env.NIX_CFLAGS_COMPILE = "-I${xorg.xorgproto}/include -I${libXft.dev}/include"; + env.NIX_CFLAGS_COMPILE = "-I${xorgproto}/include -I${libXft.dev}/include"; patchPhase = '' cd source diff --git a/pkgs/by-name/li/libcosmicAppHook/package.nix b/pkgs/by-name/li/libcosmicAppHook/package.nix index 976b14013620..7ea4f42df493 100644 --- a/pkgs/by-name/li/libcosmicAppHook/package.nix +++ b/pkgs/by-name/li/libcosmicAppHook/package.nix @@ -15,7 +15,10 @@ cosmic-settings, libGL, libxkbcommon, - xorg, + libxi, + libxcursor, + libx11, + libxcb, wayland, vulkan-loader, @@ -36,10 +39,10 @@ makeSetupHook { [ libGL libxkbcommon - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libxcb + libx11 + libxcursor + libxi + libxcb ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ wayland diff --git a/pkgs/by-name/li/libgaminggear/package.nix b/pkgs/by-name/li/libgaminggear/package.nix index 504f9e8483bf..5d11ff8a1de0 100644 --- a/pkgs/by-name/li/libgaminggear/package.nix +++ b/pkgs/by-name/li/libgaminggear/package.nix @@ -11,7 +11,8 @@ libnotify, pcre, sqlite, - xorg, + libxdmcp, + libpthread-stubs, harfbuzz, }: @@ -49,8 +50,8 @@ stdenv.mkDerivation rec { libnotify pcre sqlite - xorg.libXdmcp - xorg.libpthreadstubs + libxdmcp + libpthread-stubs ]; cmakeFlags = [ diff --git a/pkgs/by-name/li/libprojectm/package.nix b/pkgs/by-name/li/libprojectm/package.nix index be20e9e286ac..ee3e8c451541 100644 --- a/pkgs/by-name/li/libprojectm/package.nix +++ b/pkgs/by-name/li/libprojectm/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, libGL, - xorg, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libGL - xorg.libX11 + libx11 ]; strictDeps = true; diff --git a/pkgs/by-name/li/libresprite/package.nix b/pkgs/by-name/li/libresprite/package.nix index 14df46eb85e8..3c5735df67c2 100644 --- a/pkgs/by-name/li/libresprite/package.nix +++ b/pkgs/by-name/li/libresprite/package.nix @@ -17,7 +17,7 @@ libX11, pixman, tinyxml-2, - xorg, + libxi, zlib, SDL2, SDL2_image, @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { # no v8 due to missing libplatform and libbase ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - xorg.libXi + libxi ]; cmakeFlags = [ diff --git a/pkgs/by-name/li/libtas/package.nix b/pkgs/by-name/li/libtas/package.nix index f40f06ea4777..f200e7a760e8 100644 --- a/pkgs/by-name/li/libtas/package.nix +++ b/pkgs/by-name/li/libtas/package.nix @@ -10,7 +10,7 @@ ffmpeg, lua5_4, qt5, - xorg, + libxi, file, binutils, makeDesktopItem, @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { } \ --suffix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ - xorg.libXi + libxi ffmpeg.lib ] } \ diff --git a/pkgs/by-name/li/libuiohook/package.nix b/pkgs/by-name/li/libuiohook/package.nix index f1924f0378ce..bc192a1f6cef 100644 --- a/pkgs/by-name/li/libuiohook/package.nix +++ b/pkgs/by-name/li/libuiohook/package.nix @@ -9,7 +9,14 @@ libxcb, libxkbcommon, xinput, - xorg, + libxt, + libxtst, + libxi, + libxinerama, + libxext, + libxdmcp, + libxau, + libxkbfile, }: stdenv.mkDerivation rec { @@ -33,14 +40,14 @@ stdenv.mkDerivation rec { libxcb libxkbcommon xinput - xorg.libXau - xorg.libXdmcp - xorg.libXi - xorg.libXinerama - xorg.libXt - xorg.libXtst - xorg.libXext - xorg.libxkbfile + libxau + libxdmcp + libxi + libxinerama + libxt + libxtst + libxext + libxkbfile ]; outputs = [ diff --git a/pkgs/by-name/li/libvdpau/package.nix b/pkgs/by-name/li/libvdpau/package.nix index 6a4f9e594899..d1c177d5307b 100644 --- a/pkgs/by-name/li/libvdpau/package.nix +++ b/pkgs/by-name/li/libvdpau/package.nix @@ -3,7 +3,9 @@ stdenv, fetchurl, pkg-config, - xorg, + libxext, + libx11, + xorgproto, mesa, meson, ninja, @@ -30,11 +32,11 @@ stdenv.mkDerivation rec { pkg-config ]; buildInputs = [ - xorg.xorgproto - xorg.libXext + xorgproto + libxext ]; - propagatedBuildInputs = [ xorg.libX11 ]; + propagatedBuildInputs = [ libx11 ]; mesonFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-Dmoduledir=${mesa.driverLink}/lib/vdpau" diff --git a/pkgs/by-name/li/libxkbcommon_8/package.nix b/pkgs/by-name/li/libxkbcommon_8/package.nix index 40ebb5c6cecb..899b321079e7 100644 --- a/pkgs/by-name/li/libxkbcommon_8/package.nix +++ b/pkgs/by-name/li/libxkbcommon_8/package.nix @@ -14,7 +14,7 @@ libX11, # To enable the "interactive-wayland" subcommand of xkbcli. This is the # wayland equivalent of `xev` on X11. - xorg, + xvfb, withWaylandTools ? stdenv.hostPlatform.isLinux, wayland, wayland-protocols, @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { bison doxygen ] - ++ lib.optional stdenv.isLinux xorg.xvfb + ++ lib.optional stdenv.isLinux xvfb ++ lib.optional withWaylandTools wayland-scanner; buildInputs = [ diff --git a/pkgs/by-name/li/libxklavier/package.nix b/pkgs/by-name/li/libxklavier/package.nix index cecbb5d42260..2c0dff5adffb 100644 --- a/pkgs/by-name/li/libxklavier/package.nix +++ b/pkgs/by-name/li/libxklavier/package.nix @@ -8,7 +8,11 @@ gtk-doc, xkeyboard_config, libxml2, - xorg, + libxi, + libx11, + libice, + xkbcomp, + libxkbfile, docbook_xsl, glib, isocodes, @@ -44,13 +48,13 @@ stdenv.mkDerivation rec { # TODO: enable xmodmap support, needs xmodmap DB propagatedBuildInputs = [ - xorg.libX11 - xorg.libXi + libx11 + libxi xkeyboard_config libxml2 - xorg.libICE + libice glib - xorg.libxkbfile + libxkbfile isocodes ]; @@ -69,7 +73,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-xkb-base=${xkeyboard_config}/etc/X11/xkb" - "--with-xkb-bin-base=${xorg.xkbcomp}/bin" + "--with-xkb-bin-base=${xkbcomp}/bin" "--disable-xmodmap-support" "${if withDoc then "--enable-gtk-doc" else "--disable-gtk-doc"}" ]; diff --git a/pkgs/by-name/li/lightburn/package.nix b/pkgs/by-name/li/lightburn/package.nix index df15a74ba638..1b4e5bd9de1e 100644 --- a/pkgs/by-name/li/lightburn/package.nix +++ b/pkgs/by-name/li/lightburn/package.nix @@ -12,7 +12,8 @@ e2fsprogs, makeDesktopItem, copyDesktopItems, - xorg, + libx11, + libxcb, libGL, alsa-lib, freetype, @@ -43,8 +44,8 @@ stdenv.mkDerivation rec { cups libgpg-error e2fsprogs - xorg.libX11 - xorg.libxcb + libx11 + libxcb libGL alsa-lib freetype diff --git a/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix b/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix index d322188ed60c..91bbedc0e5dd 100644 --- a/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix +++ b/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix @@ -8,7 +8,9 @@ dbus, pcre, libepoxy, - xorg, + libxdmcp, + libx11, + libpthread-stubs, at-spi2-core, libxklavier, libxkbcommon, @@ -51,15 +53,15 @@ stdenv.mkDerivation { pcre libepoxy libgee - xorg.libX11 + libx11 lightdm - xorg.libXdmcp + libxdmcp gdk-pixbuf clutter-gtk libxklavier at-spi2-core libxkbcommon - xorg.libpthreadstubs + libpthread-stubs librsvg ]; diff --git a/pkgs/by-name/li/livecaptions/package.nix b/pkgs/by-name/li/livecaptions/package.nix index b7eb32470863..baba732e7b2a 100644 --- a/pkgs/by-name/li/livecaptions/package.nix +++ b/pkgs/by-name/li/livecaptions/package.nix @@ -13,7 +13,7 @@ onnxruntime, libadwaita, libpulseaudio, - xorg, + libx11, }: let aprilAsr = fetchFromGitHub { @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { onnxruntime libadwaita libpulseaudio - xorg.libX11 + libx11 ]; postUnpack = '' diff --git a/pkgs/by-name/lo/lobster/package.nix b/pkgs/by-name/lo/lobster/package.nix index 929fd261d3a8..9336e9a24af8 100644 --- a/pkgs/by-name/lo/lobster/package.nix +++ b/pkgs/by-name/lo/lobster/package.nix @@ -8,7 +8,8 @@ # Linux deps libGL, - xorg, + libxext, + libx11, }: @@ -34,8 +35,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL - xorg.libX11 - xorg.libXext + libx11 + libxext ]; preConfigure = '' diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix index 501b333f9cdb..dc0edbaed248 100644 --- a/pkgs/by-name/lu/luanti/package.nix +++ b/pkgs/by-name/lu/luanti/package.nix @@ -21,7 +21,8 @@ doxygen, ncurses, graphviz, - xorg, + libxi, + libx11, gmp, libspatialindex, leveldb, @@ -113,8 +114,8 @@ stdenv.mkDerivation (finalAttrs: { (if useSdl3 then sdl3 else SDL2) ] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin) [ - xorg.libX11 - xorg.libXi + libx11 + libxi ] ++ lib.optionals buildServer [ leveldb diff --git a/pkgs/by-name/lu/lutgen-studio/package.nix b/pkgs/by-name/lu/lutgen-studio/package.nix index 6634596aee62..da2c379170d5 100644 --- a/pkgs/by-name/lu/lutgen-studio/package.nix +++ b/pkgs/by-name/lu/lutgen-studio/package.nix @@ -9,7 +9,10 @@ libxkbcommon, openssl, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, nix-update-script, }: @@ -47,10 +50,10 @@ rustPlatform.buildRustPackage rec { libxkbcommon openssl wayland - xorg.libXcursor - xorg.libXrandr - xorg.libXi - xorg.libX11 + libxcursor + libxrandr + libxi + libx11 ]; in '' diff --git a/pkgs/by-name/lu/lutris-unwrapped/package.nix b/pkgs/by-name/lu/lutris-unwrapped/package.nix index 19a28e40ba6c..a06c8fb92384 100644 --- a/pkgs/by-name/lu/lutris-unwrapped/package.nix +++ b/pkgs/by-name/lu/lutris-unwrapped/package.nix @@ -33,7 +33,8 @@ libstrangle, fluidsynth, xorgserver, - xorg, + xkbcomp, + setxkbmap, util-linux, pkg-config, desktop-file-utils, @@ -54,8 +55,8 @@ let libstrangle fluidsynth xorgserver - xorg.setxkbmap - xorg.xkbcomp + setxkbmap + xkbcomp # bypass mount suid wrapper which does not work in fhsenv util-linux ]; diff --git a/pkgs/by-name/lu/lutris/package.nix b/pkgs/by-name/lu/lutris/package.nix index 21444c992e7b..7798d2c7ed17 100644 --- a/pkgs/by-name/lu/lutris/package.nix +++ b/pkgs/by-name/lu/lutris/package.nix @@ -26,27 +26,27 @@ let ]; xorgDeps = pkgs: with pkgs; [ - xorg.libX11 - xorg.libXrender - xorg.libXrandr - xorg.libxcb - xorg.libXmu - xorg.libpthreadstubs - xorg.libXext - xorg.libXdmcp - xorg.libXxf86vm - xorg.libXinerama - xorg.libSM - xorg.libXv - xorg.libXaw - xorg.libXi - xorg.libXcursor - xorg.libXcomposite - xorg.libXfixes - xorg.libXtst - xorg.libXScrnSaver - xorg.libICE - xorg.libXt + libx11 + libxrender + libxrandr + libxcb + libxmu + libpthread-stubs + libxext + libxdmcp + libxxf86vm + libxinerama + libsm + libxv + libxaw + libxi + libxcursor + libxcomposite + libxfixes + libxtst + libxscrnsaver + libice + libxt ]; gstreamerDeps = pkgs: with pkgs.gst_all_1; [ @@ -177,7 +177,7 @@ buildFHSEnv { flex # WINE - xorg.xrandr + xrandr perl which p7zip diff --git a/pkgs/by-name/lv/lv2lint/package.nix b/pkgs/by-name/lv/lv2lint/package.nix index 96204f473a26..33bea76728d8 100644 --- a/pkgs/by-name/lv/lv2lint/package.nix +++ b/pkgs/by-name/lv/lv2lint/package.nix @@ -9,7 +9,7 @@ lilv, curl, elfutils, - xorg, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { lilv curl elfutils - xorg.libX11 + libx11 ]; mesonFlags = [ diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix index 7185edc7935e..be37edf31f4b 100644 --- a/pkgs/by-name/ly/LycheeSlicer/package.nix +++ b/pkgs/by-name/ly/LycheeSlicer/package.nix @@ -3,7 +3,7 @@ fetchurl, makeDesktopItem, lib, - xorg, + libxshmfence, wayland, wayland-protocols, }: @@ -42,7 +42,7 @@ appimageTools.wrapType2 { ''; extraPkgs = _: [ - xorg.libxshmfence + libxshmfence wayland wayland-protocols ]; diff --git a/pkgs/by-name/ma/maiko/package.nix b/pkgs/by-name/ma/maiko/package.nix index 831dde3c7a5f..3114dafc8c87 100644 --- a/pkgs/by-name/ma/maiko/package.nix +++ b/pkgs/by-name/ma/maiko/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, cmake, - xorg, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; installPhase = '' runHook preInstall @@ -32,6 +32,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://interlisp.org/"; changelog = "https://github.com/Interlisp/maiko/releases"; license = lib.licenses.mit; - inherit (xorg.libX11.meta) platforms; + inherit (libx11.meta) platforms; }; }) diff --git a/pkgs/by-name/ma/mailspring/linux.nix b/pkgs/by-name/ma/mailspring/linux.nix index db2be8ddefcf..2164a10122fd 100644 --- a/pkgs/by-name/ma/mailspring/linux.nix +++ b/pkgs/by-name/ma/mailspring/linux.nix @@ -18,7 +18,11 @@ nss, openssl, udev, - xorg, + libxtst, + libxscrnsaver, + libxdamage, + libxshmfence, + libxkbfile, libgbm, libdrm, libappindicator, @@ -46,11 +50,11 @@ stdenv.mkDerivation (finalAttrs: { libkrb5 libsecret nss - xorg.libxkbfile - xorg.libXdamage - xorg.libXScrnSaver - xorg.libXtst - xorg.libxshmfence + libxkbfile + libxdamage + libxscrnsaver + libxtst + libxshmfence libgbm libdrm ]; diff --git a/pkgs/by-name/ma/marktext/package.nix b/pkgs/by-name/ma/marktext/package.nix index a272bb06e9b4..e27e971ca820 100644 --- a/pkgs/by-name/ma/marktext/package.nix +++ b/pkgs/by-name/ma/marktext/package.nix @@ -8,7 +8,9 @@ nodejs, electron, python3, - xorg, + libx11, + xorgproto, + libxkbfile, fontconfig, node-gyp-build, ripgrep, @@ -58,10 +60,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libsecret - xorg.libX11 - xorg.libxkbfile + libx11 + libxkbfile fontconfig - xorg.xorgproto + xorgproto ]; postPatch = '' diff --git a/pkgs/by-name/ma/mathematica/generic.nix b/pkgs/by-name/ma/mathematica/generic.nix index d642028cae39..3c38de14a67f 100644 --- a/pkgs/by-name/ma/mathematica/generic.nix +++ b/pkgs/by-name/ma/mathematica/generic.nix @@ -45,7 +45,22 @@ xcbutilimage, xcbutilkeysyms, xkeyboard_config, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxmu, + libxi, + libxinerama, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libsm, + libice, + libxcb, zlib, # options cudaSupport, @@ -115,22 +130,22 @@ stdenv.mkDerivation { xcbutilimage xcbutilkeysyms xkeyboard_config - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXinerama - xorg.libXmu - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb + libice + libsm + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxinerama + libxmu + libxrandr + libxrender + libxtst + libxcb ] ++ lib.optional cudaSupport cudaEnv; diff --git a/pkgs/by-name/mc/mcpelauncher-client/package.nix b/pkgs/by-name/mc/mcpelauncher-client/package.nix index d1516cdda61c..41ca23a21ebb 100644 --- a/pkgs/by-name/mc/mcpelauncher-client/package.nix +++ b/pkgs/by-name/mc/mcpelauncher-client/package.nix @@ -9,7 +9,9 @@ zlib, libpng, libglvnd, - xorg, + libxtst, + libxi, + libx11, libevdev, curl, pulseaudio, @@ -68,9 +70,9 @@ clangStdenv.mkDerivation (finalAttrs: { zlib libpng libglvnd - xorg.libX11 - xorg.libXi - xorg.libXtst + libx11 + libxi + libxtst libevdev curl pulseaudio diff --git a/pkgs/by-name/me/mediagoblin/package.nix b/pkgs/by-name/me/mediagoblin/package.nix index 6c6269d9ce22..649d98b3ea33 100644 --- a/pkgs/by-name/me/mediagoblin/package.nix +++ b/pkgs/by-name/me/mediagoblin/package.nix @@ -7,7 +7,7 @@ gst_all_1, poppler-utils, python3, - xorg, + lndir, }: let @@ -76,7 +76,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection python3.pkgs.babel - xorg.lndir + lndir ]; build-system = with python.pkgs; [ diff --git a/pkgs/by-name/me/megaglest/package.nix b/pkgs/by-name/me/megaglest/package.nix index 91b2b7c1a877..d4ff02faf708 100644 --- a/pkgs/by-name/me/megaglest/package.nix +++ b/pkgs/by-name/me/megaglest/package.nix @@ -21,7 +21,10 @@ libpng, fontconfig, freetype, - xorg, + libxext, + libx11, + libsm, + libice, makeWrapper, bash, which, @@ -37,10 +40,10 @@ let name = "megaglest-lib-env"; paths = [ SDL2 - xorg.libSM - xorg.libICE - xorg.libX11 - xorg.libXext + libsm + libice + libx11 + libxext xercesc openal libvorbis @@ -117,7 +120,7 @@ stdenv.mkDerivation { buildInputs = [ curl SDL2 - xorg.libX11 + libx11 xercesc openal lua diff --git a/pkgs/by-name/me/megapixels/package.nix b/pkgs/by-name/me/megapixels/package.nix index 31d55d2dcd30..f24c692dca1c 100644 --- a/pkgs/by-name/me/megapixels/package.nix +++ b/pkgs/by-name/me/megapixels/package.nix @@ -13,7 +13,7 @@ libepoxy, libmegapixels, libpulseaudio, - xorg, + libxrandr, zbar, tiffSupport ? true, libraw, @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { libepoxy libmegapixels libpulseaudio - xorg.libXrandr + libxrandr zbar ]; diff --git a/pkgs/by-name/me/megasync/package.nix b/pkgs/by-name/me/megasync/package.nix index cf951fb801b5..dab7f505ec8f 100644 --- a/pkgs/by-name/me/megasync/package.nix +++ b/pkgs/by-name/me/megasync/package.nix @@ -27,7 +27,7 @@ readline, sqlite, wget, - xorg, + xrdb, zlib, nix-update-script, @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { ]; preFixup = '' - qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ xorg.xrdb ]}) + qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ xrdb ]}) ''; passthru = { diff --git a/pkgs/by-name/me/melmatcheq-lv2/package.nix b/pkgs/by-name/me/melmatcheq-lv2/package.nix index 82423408c7cd..427a6c5250d4 100644 --- a/pkgs/by-name/me/melmatcheq-lv2/package.nix +++ b/pkgs/by-name/me/melmatcheq-lv2/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libx11, xorgproto, cairo, lv2, @@ -22,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 xorgproto cairo lv2 diff --git a/pkgs/by-name/me/menyoki/package.nix b/pkgs/by-name/me/menyoki/package.nix index 9198f0f4d442..b5b5d8e8d0a0 100644 --- a/pkgs/by-name/me/menyoki/package.nix +++ b/pkgs/by-name/me/menyoki/package.nix @@ -7,7 +7,8 @@ stdenv, withSixel ? false, libsixel, - xorg, + libxrandr, + libx11, withSki ? true, }: @@ -29,8 +30,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional withSixel libsixel ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - xorg.libXrandr + libx11 + libxrandr ]; buildNoDefaultFeatures = !withSki; diff --git a/pkgs/by-name/me/metacity/package.nix b/pkgs/by-name/me/metacity/package.nix index 74bc821b8073..42e95fd6c4f7 100644 --- a/pkgs/by-name/me/metacity/package.nix +++ b/pkgs/by-name/me/metacity/package.nix @@ -7,7 +7,10 @@ gnome, gsettings-desktop-schemas, gtk3, - xorg, + libxres, + libxpresent, + libxdamage, + libx11, libcanberra-gtk3, libgtop, libstartup_notification, @@ -33,10 +36,10 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libXres - xorg.libXpresent - xorg.libXdamage - xorg.libX11 + libxres + libxpresent + libxdamage + libx11 glib gsettings-desktop-schemas gtk3 diff --git a/pkgs/by-name/mi/microsoft-identity-broker/package.nix b/pkgs/by-name/mi/microsoft-identity-broker/package.nix index ac38570b14c7..55e854c1cb75 100644 --- a/pkgs/by-name/mi/microsoft-identity-broker/package.nix +++ b/pkgs/by-name/mi/microsoft-identity-broker/package.nix @@ -10,7 +10,7 @@ nixosTests, bash, glib, - xorg, + libxtst, alsa-lib, }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - xorg.libXtst + libxtst alsa-lib ]; diff --git a/pkgs/by-name/mi/minivmac/package.nix b/pkgs/by-name/mi/minivmac/package.nix index 0253073a3511..663a3cf47515 100644 --- a/pkgs/by-name/mi/minivmac/package.nix +++ b/pkgs/by-name/mi/minivmac/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, buildPackages, alsa-lib, - xorg, + libx11, }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hash = "sha256-iiEE0ioXh3keKUPfAB+YcE1iggGLpxT9N8LSVFDhttE="; }; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/by-name/mo/mochi/package.nix b/pkgs/by-name/mo/mochi/package.nix index 22b87f1a4e5d..a9a63fad183b 100644 --- a/pkgs/by-name/mo/mochi/package.nix +++ b/pkgs/by-name/mo/mochi/package.nix @@ -5,7 +5,7 @@ fetchzip, lib, stdenvNoCC, - xorg, + libxshmfence, }: let @@ -22,7 +22,7 @@ let appimageContents = appimageTools.extractType2 { inherit pname version src; }; - extraPkgs = pkgs: [ xorg.libxshmfence ]; + extraPkgs = pkgs: [ libxshmfence ]; extraInstallCommands = '' install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/ diff --git a/pkgs/by-name/mo/modrinth-app/package.nix b/pkgs/by-name/mo/modrinth-app/package.nix index baf52dc3f9c0..7772da261cd1 100644 --- a/pkgs/by-name/mo/modrinth-app/package.nix +++ b/pkgs/by-name/mo/modrinth-app/package.nix @@ -25,7 +25,12 @@ symlinkJoin, udev, wrapGAppsHook3, - xorg, + libxxf86vm, + libxrandr, + libxext, + libxcursor, + libx11, + xrandr, }: symlinkJoin { @@ -52,11 +57,11 @@ symlinkJoin { # glfw libGL - xorg.libX11 - xorg.libXcursor - xorg.libXext - xorg.libXrandr - xorg.libXxf86vm + libx11 + libxcursor + libxext + libxrandr + libxxf86vm # lwjgl (lib.getLib stdenv.cc.cc) @@ -79,7 +84,7 @@ symlinkJoin { gappsWrapperArgs+=( --prefix PATH : ${lib.makeSearchPath "bin/java" jdks} ${lib.optionalString stdenv.hostPlatform.isLinux '' - --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} + --prefix PATH : ${lib.makeBinPath [ xrandr ]} --set LD_LIBRARY_PATH $runtimeDependencies ''} ) diff --git a/pkgs/by-name/mo/molden/package.nix b/pkgs/by-name/mo/molden/package.nix index 38f529d426e0..860a25cedf71 100644 --- a/pkgs/by-name/mo/molden/package.nix +++ b/pkgs/by-name/mo/molden/package.nix @@ -5,7 +5,8 @@ which, gfortran, libGLU, - xorg, + libxmu, + libx11, }: stdenv.mkDerivation rec { @@ -21,8 +22,8 @@ stdenv.mkDerivation rec { buildInputs = [ gfortran libGLU - xorg.libX11 - xorg.libXmu + libx11 + libxmu ]; patches = [ ./dont_register_file_types.patch ]; diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index ca8716e4fb57..cfd62c808d71 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -8,7 +8,19 @@ makeWrapper, runtimeShell, gtk3, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxshmfence, + libxkbfile, glib, cairo, pango, @@ -90,19 +102,19 @@ let pango stdenv.cc.cc systemd - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxkbfile - xorg.libxshmfence + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxkbfile + libxshmfence (lib.getLib stdenv.cc.cc) ]; in diff --git a/pkgs/by-name/mo/moonlight-embedded/package.nix b/pkgs/by-name/mo/moonlight-embedded/package.nix index eb92a97cc0f4..6ebea089c47f 100644 --- a/pkgs/by-name/mo/moonlight-embedded/package.nix +++ b/pkgs/by-name/mo/moonlight-embedded/package.nix @@ -11,7 +11,8 @@ SDL2, ffmpeg, pkg-config, - xorg, + libpthread-stubs, + libxcb, libvdpau, libpulseaudio, libcec, @@ -51,11 +52,11 @@ stdenv.mkDerivation rec { udev SDL2 ffmpeg - xorg.libxcb + libxcb libvdpau libpulseaudio libcec - xorg.libpthreadstubs + libpthread-stubs curl expat avahi diff --git a/pkgs/by-name/mo/mousetweaks/package.nix b/pkgs/by-name/mo/mousetweaks/package.nix index adef94490f6c..e5dc9f4f8c95 100644 --- a/pkgs/by-name/mo/mousetweaks/package.nix +++ b/pkgs/by-name/mo/mousetweaks/package.nix @@ -8,7 +8,10 @@ gnome, gsettings-desktop-schemas, wrapGAppsHook3, - xorg, + libxtst, + libxfixes, + libxcursor, + libx11, }: stdenv.mkDerivation rec { @@ -29,10 +32,10 @@ stdenv.mkDerivation rec { glib gtk3 gsettings-desktop-schemas - xorg.libX11 - xorg.libXtst - xorg.libXfixes - xorg.libXcursor + libx11 + libxtst + libxfixes + libxcursor ]; passthru = { diff --git a/pkgs/by-name/mq/mqttx/package.nix b/pkgs/by-name/mq/mqttx/package.nix index b05448f26df2..8e6caa95094f 100644 --- a/pkgs/by-name/mq/mqttx/package.nix +++ b/pkgs/by-name/mq/mqttx/package.nix @@ -35,7 +35,7 @@ in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: [ pkgs.xorg.libxshmfence ]; + extraPkgs = pkgs: [ pkgs.libxshmfence ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop diff --git a/pkgs/by-name/mr/mricron/package.nix b/pkgs/by-name/mr/mricron/package.nix index d79f59bced84..0a02ff058b2a 100644 --- a/pkgs/by-name/mr/mricron/package.nix +++ b/pkgs/by-name/mr/mricron/package.nix @@ -15,7 +15,7 @@ makeDesktopItem, pango, unzip, - xorg, + libx11, zlib, }: stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { glib gdk-pixbuf pango - xorg.libX11 + libx11 zlib ]; diff --git a/pkgs/by-name/ms/mslicer/package.nix b/pkgs/by-name/ms/mslicer/package.nix index 08743270ee8d..8ea8d7a216e5 100644 --- a/pkgs/by-name/ms/mslicer/package.nix +++ b/pkgs/by-name/ms/mslicer/package.nix @@ -7,7 +7,10 @@ rustPlatform, vulkan-loader, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -28,10 +31,10 @@ rustPlatform.buildRustPackage (finalAttrs: { libxkbcommon vulkan-loader wayland - xorg.libXcursor - xorg.libXrandr - xorg.libXi - xorg.libX11 + libxcursor + libxrandr + libxi + libx11 ]; # Force linking to libEGL, which is always dlopen()ed, and to diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix index ed6174c7df68..0f129ae4e6cb 100644 --- a/pkgs/by-name/mu/mullvad-vpn/package.nix +++ b/pkgs/by-name/mu/mullvad-vpn/package.nix @@ -20,7 +20,19 @@ libgbm, libGL, wayland, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxshmfence, + libxcb, autoPatchelfHook, systemd, libnotify, @@ -49,19 +61,19 @@ let libappindicator libnotify libgbm - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb - xorg.libxshmfence + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxcb + libxshmfence nspr nss systemd diff --git a/pkgs/by-name/mu/multiviewer-for-f1/package.nix b/pkgs/by-name/mu/multiviewer-for-f1/package.nix index 5eeeae31c7ea..c1eb6b9a6203 100644 --- a/pkgs/by-name/mu/multiviewer-for-f1/package.nix +++ b/pkgs/by-name/mu/multiviewer-for-f1/package.nix @@ -21,7 +21,13 @@ nspr, nss, pango, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxcb, writeScript, }: let @@ -58,13 +64,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { nspr nss pango - xorg.libX11 - xorg.libXcomposite - xorg.libxcb - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr + libx11 + libxcomposite + libxcb + libxdamage + libxext + libxfixes + libxrandr ]; dontBuild = true; diff --git a/pkgs/by-name/mu/multivnc/package.nix b/pkgs/by-name/mu/multivnc/package.nix index a17e323628c1..8428293895d8 100644 --- a/pkgs/by-name/mu/multivnc/package.nix +++ b/pkgs/by-name/mu/multivnc/package.nix @@ -17,7 +17,8 @@ libsepol, libthai, libdatrie, - xorg, + libxtst, + libxdmcp, lerc, libxkbcommon, libepoxy, @@ -84,8 +85,8 @@ stdenv.mkDerivation { lerc libxkbcommon libepoxy - xorg.libXdmcp - xorg.libXtst + libxdmcp + libxtst ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/nc/ncview/package.nix b/pkgs/by-name/nc/ncview/package.nix index 9845006113ae..5259aa000d99 100644 --- a/pkgs/by-name/nc/ncview/package.nix +++ b/pkgs/by-name/nc/ncview/package.nix @@ -6,7 +6,11 @@ libpng, udunits, netcdf, - xorg, + libxt, + libxaw, + libx11, + libsm, + libice, }: stdenv.mkDerivation (finalAttrs: { @@ -29,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { libpng netcdf udunits - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXaw - xorg.libXt + libice + libsm + libx11 + libxaw + libxt ]; meta = { diff --git a/pkgs/by-name/ne/neothesia/package.nix b/pkgs/by-name/ne/neothesia/package.nix index e3de241ad2d6..31e79e2fbc1a 100644 --- a/pkgs/by-name/ne/neothesia/package.nix +++ b/pkgs/by-name/ne/neothesia/package.nix @@ -9,7 +9,10 @@ makeWrapper, libxkbcommon, vulkan-loader, - xorg, + libxrender, + libxi, + libxcursor, + libx11, }: let version = "0.3.1"; @@ -49,10 +52,10 @@ rustPlatform.buildRustPackage { wayland libxkbcommon vulkan-loader - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrender + libx11 + libxcursor + libxi + libxrender ] }" diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index e0cff9bcdd65..168457b35776 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -16,7 +16,11 @@ cctools, SDL2, fontconfig, - xorg, + libxrandr, + libxi, + libxext, + libxcursor, + libx11, stdenv, libglvnd, libxkbcommon, @@ -87,11 +91,11 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: { [ libglvnd libxkbcommon - xorg.libX11 - xorg.libXcursor - xorg.libXext - xorg.libXrandr - xorg.libXi + libx11 + libxcursor + libxext + libxrandr + libxi ] ++ lib.optionals enableWayland [ wayland ] ); diff --git a/pkgs/by-name/ne/netgen/package.nix b/pkgs/by-name/ne/netgen/package.nix index babe467c9ccd..1272a7e2fed0 100644 --- a/pkgs/by-name/ne/netgen/package.nix +++ b/pkgs/by-name/ne/netgen/package.nix @@ -17,7 +17,7 @@ zlib, tcl, tk, - xorg, + libxmu, libjpeg, ffmpeg, catch2, @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { tcl tk libGLU - xorg.libXmu + libxmu libjpeg ffmpeg mpi diff --git a/pkgs/by-name/ne/neuron/package.nix b/pkgs/by-name/ne/neuron/package.nix index b836deae90c9..9b3d54ccbe30 100644 --- a/pkgs/by-name/ne/neuron/package.nix +++ b/pkgs/by-name/ne/neuron/package.nix @@ -3,7 +3,9 @@ stdenv, fetchFromGitHub, readline, - xorg, + libxext, + libxcomposite, + libx11, mpi, cmake, bison, @@ -42,9 +44,9 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = optionals useIv [ - xorg.libX11.dev - xorg.libXcomposite.dev - xorg.libXext.dev + libx11.dev + libxcomposite.dev + libxext.dev ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix index d1adf3dfd117..32dc1d833dce 100644 --- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix +++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix @@ -8,7 +8,12 @@ makeDesktopItem, nss, cairo, - xorg, + libxrandr, + libxfixes, + libxdamage, + libxcursor, + libxcomposite, + libx11, libxkbcommon, alsa-lib, at-spi2-core, @@ -91,12 +96,12 @@ let libgbm libGL libglvnd - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXrandr - xorg.libXfixes - xorg.libXcursor + libx11 + libxcomposite + libxdamage + libxrandr + libxfixes + libxcursor ]; # Required to launch the application and proceed past the zygote_linux fork() process diff --git a/pkgs/by-name/ni/ninjas2/package.nix b/pkgs/by-name/ni/ninjas2/package.nix index 07089ee9d8ca..be4b5791d0b8 100644 --- a/pkgs/by-name/ni/ninjas2/package.nix +++ b/pkgs/by-name/ni/ninjas2/package.nix @@ -5,7 +5,7 @@ libjack2, libGL, pkg-config, - xorg, + libx11, libsndfile, libsamplerate, }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjack2 - xorg.libX11 + libx11 libGL libsndfile libsamplerate diff --git a/pkgs/by-name/no/nordpass/package.nix b/pkgs/by-name/no/nordpass/package.nix index bece26ceeea9..babc43777c02 100644 --- a/pkgs/by-name/no/nordpass/package.nix +++ b/pkgs/by-name/no/nordpass/package.nix @@ -3,7 +3,21 @@ lib, stdenv, squashfsTools, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libsm, + libice, + libxshmfence, + libxcb, alsa-lib, freetype, glib, @@ -70,21 +84,21 @@ let pango stdenv.cc.cc systemd - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libxshmfence - xorg.libXtst + libice + libsm + libx11 + libxcb + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxscrnsaver + libxshmfence + libxtst zlib ]; diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix index 6ecd51425d85..0cc6a14f03db 100644 --- a/pkgs/by-name/no/normcap/package.nix +++ b/pkgs/by-name/no/normcap/package.nix @@ -7,7 +7,7 @@ leptonica, wl-clipboard, libnotify, - xorg, + xvfb, makeDesktopItem, copyDesktopItems, }: @@ -112,7 +112,7 @@ ps.buildPythonApplication rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ ps.pytest-xvfb - xorg.xvfb + xvfb ]; preCheck = '' diff --git a/pkgs/by-name/nu/numworks-epsilon/package.nix b/pkgs/by-name/nu/numworks-epsilon/package.nix index d8a48ec84af1..772c3e7a164e 100644 --- a/pkgs/by-name/nu/numworks-epsilon/package.nix +++ b/pkgs/by-name/nu/numworks-epsilon/package.nix @@ -5,7 +5,7 @@ libpng, libjpeg, freetype, - xorg, + libxext, python3, imagemagick, gcc-arm-embedded, @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { libpng libjpeg freetype - xorg.libXext + libxext python3 imagemagick gcc-arm-embedded diff --git a/pkgs/by-name/nx/nx-libs/package.nix b/pkgs/by-name/nx/nx-libs/package.nix index 616ab0ee164c..de0f1b09400a 100644 --- a/pkgs/by-name/nx/nx-libs/package.nix +++ b/pkgs/by-name/nx/nx-libs/package.nix @@ -11,7 +11,21 @@ libxml2, pkg-config, which, - xorg, + xkeyboard-config, + libxtst, + libxrandr, + libxpm, + libxinerama, + libxfont_2, + libxext, + libxdmcp, + libxdamage, + libxcomposite, + font-util, + xkbcomp, + pixman, + imake, + gccmakedep, libtirpc, }: stdenv.mkDerivation rec { @@ -38,26 +52,26 @@ stdenv.mkDerivation rec { libtool pkg-config which - xorg.gccmakedep - xorg.imake + gccmakedep + imake ]; buildInputs = [ libjpeg_turbo libpng libxml2 - xorg.fontutil - xorg.libXcomposite - xorg.libXdamage - xorg.libXdmcp - xorg.libXext - xorg.libXfont2 - xorg.libXinerama - xorg.libXpm - xorg.libXrandr - xorg.libXtst - xorg.pixman - xorg.xkbcomp - xorg.xkeyboardconfig + font-util + libxcomposite + libxdamage + libxdmcp + libxext + libxfont_2 + libxinerama + libxpm + libxrandr + libxtst + pixman + xkbcomp + xkeyboard-config libtirpc ]; diff --git a/pkgs/by-name/nz/nzportable/fteqw.nix b/pkgs/by-name/nz/nzportable/fteqw.nix index 8be5ef62f08e..1c1bd95072e9 100644 --- a/pkgs/by-name/nz/nzportable/fteqw.nix +++ b/pkgs/by-name/nz/nzportable/fteqw.nix @@ -14,7 +14,14 @@ zlib, gnutls, libGL, - xorg, + libxxf86vm, + libxxf86dga, + libxscrnsaver, + libxrandr, + libxi, + libxcursor, + libx11, + libxcb, alsa-lib, libjpeg, libogg, @@ -61,11 +68,11 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libGL - xorg.libxcb - xorg.libX11 - xorg.libXrandr - xorg.libXcursor - xorg.libXScrnSaver + libxcb + libx11 + libxrandr + libxcursor + libxscrnsaver dbus fontconfig libjpeg @@ -114,12 +121,12 @@ stdenv.mkDerivation (finalAttrs: { addDriverRunpath.driverLink # gl/gl_vidlinuxglx.c - xorg.libX11 - xorg.libXrandr - xorg.libXxf86vm - xorg.libXxf86dga - xorg.libXi - xorg.libXcursor + libx11 + libxrandr + libxxf86vm + libxxf86dga + libxi + libxcursor libGL libvorbis diff --git a/pkgs/by-name/od/odamex/package.nix b/pkgs/by-name/od/odamex/package.nix index 83ceb829e46e..8811c7ce19ac 100644 --- a/pkgs/by-name/od/odamex/package.nix +++ b/pkgs/by-name/od/odamex/package.nix @@ -31,7 +31,8 @@ wayland-scanner, waylandpp, wxGTK32, - xorg, + libx11, + xorgproto, zstd, nix-update-script, @@ -95,8 +96,8 @@ stdenv.mkDerivation (finalAttrs: { libsepol ] ++ lib.optionals withX11 [ - xorg.libX11 - xorg.xorgproto + libx11 + xorgproto ] ++ lib.optionals withWayland [ libxkbcommon diff --git a/pkgs/by-name/og/ogre-next/package.nix b/pkgs/by-name/og/ogre-next/package.nix index 99e21f9fc2ac..8e0eb1b4c5aa 100644 --- a/pkgs/by-name/og/ogre-next/package.nix +++ b/pkgs/by-name/og/ogre-next/package.nix @@ -9,7 +9,11 @@ pkg-config, SDL2, - xorg, + libxt, + libxrandr, + libxaw, + libx11, + libxcb, libGL, zlib, freetype, @@ -54,11 +58,11 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL - xorg.libX11 - xorg.libXaw - xorg.libXrandr - xorg.libXt - xorg.libxcb + libx11 + libxaw + libxrandr + libxt + libxcb ]; # TODO: Figure out Vulkan plugin deps diff --git a/pkgs/by-name/om/omnissa-horizon-client/package.nix b/pkgs/by-name/om/omnissa-horizon-client/package.nix index 2ed97fb3eba2..4ed8fe92d48d 100644 --- a/pkgs/by-name/om/omnissa-horizon-client/package.nix +++ b/pkgs/by-name/om/omnissa-horizon-client/package.nix @@ -102,17 +102,17 @@ let pixman udev omnissaHorizonClientFiles - xorg.libX11 - xorg.libXau - xorg.libXcursor - xorg.libXext - xorg.libXi - xorg.libXinerama - xorg.libxkbfile - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst + libx11 + libxau + libxcursor + libxext + libxi + libxinerama + libxkbfile + libxrandr + libxrender + libxscrnsaver + libxtst zlib libxml2_13 diff --git a/pkgs/by-name/on/onagre/package.nix b/pkgs/by-name/on/onagre/package.nix index fff99134399e..43053020e80f 100644 --- a/pkgs/by-name/on/onagre/package.nix +++ b/pkgs/by-name/on/onagre/package.nix @@ -8,7 +8,10 @@ freetype, expat, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, libxkbcommon, pop-launcher, vulkan-loader, @@ -36,10 +39,10 @@ rustPlatform.buildRustPackage { buildInputs = [ expat freetype - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ]; postFixup = diff --git a/pkgs/by-name/on/onboard/package.nix b/pkgs/by-name/on/onboard/package.nix index 196243d55289..1e6c9fbc3d36 100644 --- a/pkgs/by-name/on/onboard/package.nix +++ b/pkgs/by-name/on/onboard/package.nix @@ -26,7 +26,8 @@ procps, python3, wrapGAppsHook3, - xorg, + libxtst, + libxkbfile, yelp, }: @@ -92,8 +93,8 @@ python3.pkgs.buildPythonApplication rec { libxkbcommon mousetweaks udev - xorg.libXtst - xorg.libxkbfile + libxtst + libxkbfile ] ++ lib.optional atspiSupport at-spi2-core; diff --git a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix index 560763fb7024..482374cbdd0d 100644 --- a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix +++ b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix @@ -35,7 +35,18 @@ qt5, wrapGAppsHook3, xkeyboard_config, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, }: let @@ -106,18 +117,18 @@ let qt5.qtdeclarative qt5.qtsvg qt5.qtwayland - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst + libx11 + libxcb + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxscrnsaver + libxtst ]; dontWrapQtApps = true; @@ -150,7 +161,7 @@ let gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ - --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ + --set QTCOMPOSE "${libx11.out}/share/X11/locale" \ --set QT_QPA_PLATFORM "xcb" # the bundled version of qt does not support wayland ) diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix index f8086641cb98..1afa20c3e3e8 100644 --- a/pkgs/by-name/op/opencomposite/package.nix +++ b/pkgs/by-name/op/opencomposite/package.nix @@ -11,7 +11,7 @@ stdenv, vulkan-headers, vulkan-loader, - xorg, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { libGL vulkan-headers vulkan-loader - xorg.libX11 + libx11 ]; cmakeFlags = [ diff --git a/pkgs/by-name/op/openmeters/package.nix b/pkgs/by-name/op/openmeters/package.nix index 959d7b780b25..ff65fab8e719 100644 --- a/pkgs/by-name/op/openmeters/package.nix +++ b/pkgs/by-name/op/openmeters/package.nix @@ -10,7 +10,10 @@ freetype, libglvnd, libxkbcommon, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "openmeters"; @@ -43,10 +46,10 @@ rustPlatform.buildRustPackage (finalAttrs: { libglvnd libxkbcommon wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ] }' $out/bin/openmeters ''; diff --git a/pkgs/by-name/op/openroad/package.nix b/pkgs/by-name/op/openroad/package.nix index 881a512fc389..84ef0b8b61cf 100644 --- a/pkgs/by-name/op/openroad/package.nix +++ b/pkgs/by-name/op/openroad/package.nix @@ -37,7 +37,7 @@ tclPackages, yosys, zlib, - xorg, + libx11, llvmPackages, }: @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { zlib yaml-cpp ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libx11 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; postPatch = '' diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index b584019221ff..5e6d54e1a958 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -38,7 +38,7 @@ wayland, wayland-protocols, wrapGAppsHook3, - xorg, + libxdmcp, mimalloc, opencsg, ctestCheckHook, @@ -106,7 +106,7 @@ clangStdenv.mkDerivation rec { qtmultimedia ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ - xorg.libXdmcp + libxdmcp libICE libSM wayland diff --git a/pkgs/by-name/op/opensoldat/package.nix b/pkgs/by-name/op/opensoldat/package.nix index d9028a931ed0..e9496e4aa5ce 100644 --- a/pkgs/by-name/op/opensoldat/package.nix +++ b/pkgs/by-name/op/opensoldat/package.nix @@ -10,7 +10,7 @@ physfs, openal, gamenetworkingsockets, - xorg, + libx11, autoPatchelfHook, cmake, python3, @@ -80,10 +80,10 @@ stdenv.mkDerivation rec { physfs openal gamenetworkingsockets - xorg.libX11 + libx11 ]; # TODO(@sternenseemann): set proper rpath via cmake, so we don't need autoPatchelfHook - runtimeDependencies = [ xorg.libX11 ]; + runtimeDependencies = [ libx11 ]; # make sure opensoldat{,server} find their game archive, # let them write their state and configuration files diff --git a/pkgs/by-name/op/opensubdiv/package.nix b/pkgs/by-name/op/opensubdiv/package.nix index 1c6bb47812a3..87c68e669c23 100644 --- a/pkgs/by-name/op/opensubdiv/package.nix +++ b/pkgs/by-name/op/opensubdiv/package.nix @@ -5,7 +5,12 @@ fetchFromGitHub, cmake, pkg-config, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, libGLU, libGL, glew, @@ -48,12 +53,12 @@ stdenv.mkDerivation (finalAttrs: { libGL # FIXME: these are not actually needed, but the configure script wants them. glew - xorg.libX11 - xorg.libXrandr - xorg.libXxf86vm - xorg.libXcursor - xorg.libXinerama - xorg.libXi + libx11 + libxrandr + libxxf86vm + libxcursor + libxinerama + libxi ] ++ lib.optionals (openclSupport && stdenv.hostPlatform.isLinux) [ ocl-icd diff --git a/pkgs/by-name/op/opensurge/package.nix b/pkgs/by-name/op/opensurge/package.nix index 9b3294882af6..7cf3a69e8aa0 100644 --- a/pkgs/by-name/op/opensurge/package.nix +++ b/pkgs/by-name/op/opensurge/package.nix @@ -8,7 +8,7 @@ libglvnd, surgescript, physfs, - xorg, + libx11, versionCheckHook, nix-update-script, }: @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { libglvnd physfs surgescript - xorg.libX11 + libx11 ]; cmakeFlags = [ diff --git a/pkgs/by-name/op/openvscode-server/package.nix b/pkgs/by-name/op/openvscode-server/package.nix index db9983467558..6a166a566048 100644 --- a/pkgs/by-name/op/openvscode-server/package.nix +++ b/pkgs/by-name/op/openvscode-server/package.nix @@ -14,7 +14,8 @@ node-gyp, libsecret, libkrb5, - xorg, + libx11, + libxkbfile, ripgrep, cctools, nixosTests, @@ -110,8 +111,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] ++ [ - xorg.libX11 - xorg.libxkbfile + libx11 + libxkbfile libkrb5 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index 03e490f8e0b4..be7edd5c9f3c 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -38,7 +38,7 @@ onetbb, webkitgtk_4_1, wxGTK31, - xorg, + libx11, libnoise, withSystemd ? stdenv.hostPlatform.isLinux, }: @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { onetbb webkitgtk_4_1 wxGTK' - xorg.libX11 + libx11 opencv.cxxdev libnoise ] diff --git a/pkgs/by-name/or/oreo-cursors-plus/package.nix b/pkgs/by-name/or/oreo-cursors-plus/package.nix index 4dc565c2c300..a60a55364d42 100644 --- a/pkgs/by-name/or/oreo-cursors-plus/package.nix +++ b/pkgs/by-name/or/oreo-cursors-plus/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, ruby, inkscape, - xorg, + xcursorgen, writeText, cursorsConf ? null, # If set to a string, overwrites contents of './cursors.conf' }: @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = lib.optionals (cursorsConf != null) [ ruby inkscape - xorg.xcursorgen + xcursorgen ]; # './cursors.conf' contains definitions of cursor variations to generate. diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix index 732921de1468..aa66ba58665c 100644 --- a/pkgs/by-name/os/osu-lazer/package.nix +++ b/pkgs/by-name/os/osu-lazer/package.nix @@ -13,7 +13,7 @@ lttng-ust, numactl, libglvnd, - xorg, + libxi, udev, vulkan-loader, nix-update-script, @@ -54,7 +54,7 @@ buildDotnetModule rec { libglvnd # needed for the window to actually appear - xorg.libXi + libxi # needed to avoid in runtime.log: # [verbose]: SDL error log [debug]: Failed loading udev_device_get_action: /nix/store/*-osu-lazer-*/lib/osu-lazer/runtimes/linux-x64/native/libSDL2.so: undefined symbol: _udev_device_get_action diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 50ec4711c028..24690fe25769 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -27,7 +27,7 @@ pkg-config, symlinkJoin, nltk-data, - xorg, + lndir, }: let version = "2.20.5"; @@ -167,7 +167,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gettext - xorg.lndir + lndir ]; pythonRelaxDeps = [ diff --git a/pkgs/by-name/pa/par-lang/package.nix b/pkgs/by-name/pa/par-lang/package.nix index fa7a961ae617..4975a2fd685e 100644 --- a/pkgs/by-name/pa/par-lang/package.nix +++ b/pkgs/by-name/pa/par-lang/package.nix @@ -8,7 +8,10 @@ libGL, libxkbcommon, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, makeDesktopItem, copyDesktopItems, nix-update-script, @@ -40,10 +43,10 @@ rustPlatform.buildRustPackage { libGL libxkbcommon wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ]; in lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/by-name/pa/partio/package.nix b/pkgs/by-name/pa/partio/package.nix index 6175342bda90..f029f6aa557d 100644 --- a/pkgs/by-name/pa/partio/package.nix +++ b/pkgs/by-name/pa/partio/package.nix @@ -10,7 +10,8 @@ zlib, swig, doxygen, - xorg, + libxmu, + libxi, python3, }: @@ -41,8 +42,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib swig - xorg.libXi - xorg.libXmu + libxi + libxmu ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libglut diff --git a/pkgs/by-name/pa/pax-britannica/package.nix b/pkgs/by-name/pa/pax-britannica/package.nix index 510a96269f10..c19106bdb402 100644 --- a/pkgs/by-name/pa/pax-britannica/package.nix +++ b/pkgs/by-name/pa/pax-britannica/package.nix @@ -9,7 +9,8 @@ libGL, libGLU, alsa-lib, - xorg, + libxrandr, + libx11, glfw2, glfw3, useGlfw3 ? false, @@ -68,8 +69,8 @@ stdenv.mkDerivation { libGL libGLU alsa-lib - xorg.libX11 - xorg.libXrandr + libx11 + libxrandr (if useGlfw3 then glfw3 else glfw2) ]; makeFlags = diff --git a/pkgs/by-name/pc/pcb/package.nix b/pkgs/by-name/pc/pcb/package.nix index 7a21f53684aa..52b789f3077d 100644 --- a/pkgs/by-name/pc/pcb/package.nix +++ b/pkgs/by-name/pc/pcb/package.nix @@ -19,7 +19,8 @@ tk, gnome2, gd, - xorg, + libxrender, + libxmu, }: stdenv.mkDerivation rec { @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 dbus - xorg.libXrender + libxrender freetype fontconfig libGLU @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { tk gnome2.gtkglext gd - xorg.libXmu + libxmu ]; configureFlags = [ diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix index 17e66ab4253a..01a32227eeff 100644 --- a/pkgs/by-name/pe/peazip/package.nix +++ b/pkgs/by-name/pe/peazip/package.nix @@ -5,7 +5,7 @@ qt6Packages, fpc, lazarus, - xorg, + libx11, runCommand, _7zz, brotli, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libX11 + libx11 ] ++ (with qt6Packages; [ qtbase diff --git a/pkgs/by-name/pe/pencil/package.nix b/pkgs/by-name/pe/pencil/package.nix index 544122a42127..0c198934c8f6 100644 --- a/pkgs/by-name/pe/pencil/package.nix +++ b/pkgs/by-name/pe/pencil/package.nix @@ -23,7 +23,18 @@ nspr, nss, pango, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, systemd, }: let @@ -47,18 +58,18 @@ let nspr nss pango - xorg.libX11 - xorg.libxcb - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst + libx11 + libxcb + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst (lib.getLib stdenv.cc.cc) stdenv.cc.cc ]; diff --git a/pkgs/by-name/ph/phoc/package.nix b/pkgs/by-name/ph/phoc/package.nix index 60b8fea9239a..3e1e736268b7 100644 --- a/pkgs/by-name/ph/phoc/package.nix +++ b/pkgs/by-name/ph/phoc/package.nix @@ -20,7 +20,7 @@ libdrm, libxkbcommon, wlroots_0_19, - xorg, + libxcb-wm, nix-update-script, nixosTests, testers, @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { json-glib wayland finalAttrs.wlroots - xorg.xcbutilwm + libxcb-wm gmobile ]; diff --git a/pkgs/by-name/ph/photon-rss/package.nix b/pkgs/by-name/ph/photon-rss/package.nix index f07b91e0cd5c..1313c537a328 100644 --- a/pkgs/by-name/ph/photon-rss/package.nix +++ b/pkgs/by-name/ph/photon-rss/package.nix @@ -2,7 +2,7 @@ buildGoModule, fetchFromSourcehut, lib, - xorg, + libx11, }: buildGoModule { @@ -16,7 +16,7 @@ buildGoModule { sha256 = "sha256-2RSGLWfthcChd5YhDSBfLSch6wuTUv1Sh1f7flgzQwc="; }; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; proxyVendor = true; diff --git a/pkgs/by-name/pi/picocrypt-ng/package.nix b/pkgs/by-name/pi/picocrypt-ng/package.nix index f74102afedb4..b3515af297db 100644 --- a/pkgs/by-name/pi/picocrypt-ng/package.nix +++ b/pkgs/by-name/pi/picocrypt-ng/package.nix @@ -6,7 +6,7 @@ copyDesktopItems, makeDesktopItem, - xorg, + libxxf86vm, glfw, gtk3, pkg-config, @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { ++ glfw.propagatedBuildInputs or [ ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gtk3 - xorg.libXxf86vm + libxxf86vm ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix index b9085ca4be4b..cfa8906fdd91 100644 --- a/pkgs/by-name/pi/picocrypt/package.nix +++ b/pkgs/by-name/pi/picocrypt/package.nix @@ -6,7 +6,7 @@ copyDesktopItems, makeDesktopItem, - xorg, + libxxf86vm, glfw, gtk3, pkg-config, @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { ++ glfw.propagatedBuildInputs or [ ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gtk3 - xorg.libXxf86vm + libxxf86vm ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/pi/pinball/package.nix b/pkgs/by-name/pi/pinball/package.nix index 58a4618543a4..a92b3c0951cb 100644 --- a/pkgs/by-name/pi/pinball/package.nix +++ b/pkgs/by-name/pi/pinball/package.nix @@ -9,7 +9,7 @@ SDL2, SDL2_image, SDL2_mixer, - xorg, + libsm, }: stdenv.mkDerivation { @@ -37,7 +37,7 @@ stdenv.mkDerivation { SDL2 SDL2_image SDL2_mixer - xorg.libSM + libsm ]; strictDeps = true; diff --git a/pkgs/by-name/pi/pixinsight/package.nix b/pkgs/by-name/pi/pixinsight/package.nix index 6664adc2038d..d7900f55fdee 100644 --- a/pkgs/by-name/pi/pixinsight/package.nix +++ b/pkgs/by-name/pi/pixinsight/package.nix @@ -27,7 +27,15 @@ brotli, libxkbcommon, libxcb, - xorg, + libxtst, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + xrandr, + libxkbfile, wayland, libudev0-shim, bubblewrap, @@ -150,15 +158,15 @@ let brotli libxkbcommon libxcb - xorg.libX11 - xorg.libXdamage - xorg.xrandr - xorg.libXtst - xorg.libXcomposite - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxkbfile + libx11 + libxdamage + xrandr + libxtst + libxcomposite + libxext + libxfixes + libxrandr + libxkbfile ]; profile = '' diff --git a/pkgs/by-name/pl/planetary_annihilation/package.nix b/pkgs/by-name/pl/planetary_annihilation/package.nix index a7fdf350e117..93c098f1140a 100644 --- a/pkgs/by-name/pl/planetary_annihilation/package.nix +++ b/pkgs/by-name/pl/planetary_annihilation/package.nix @@ -18,7 +18,13 @@ gdk-pixbuf, curl, systemd, - xorg, + libxrender, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, requireFile, }: @@ -50,17 +56,17 @@ stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${ lib.makeLibraryPath [ stdenv.cc.cc - xorg.libXdamage - xorg.libXfixes + libxdamage + libxfixes gtk2 glib stdenv.cc.libc "$out" - xorg.libXext + libxext pango udev - xorg.libX11 - xorg.libXcomposite + libx11 + libxcomposite alsa-lib atk nspr @@ -71,7 +77,7 @@ stdenv.mkDerivation rec { freetype gnome2.GConf gdk-pixbuf - xorg.libXrender + libxrender ] }:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" "$out/host/CoherentUI_Host" @@ -79,8 +85,8 @@ stdenv.mkDerivation rec { lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc - xorg.libX11 - xorg.libXcursor + libx11 + libxcursor gtk2 glib curl @@ -93,9 +99,9 @@ stdenv.mkDerivation rec { lib.makeLibraryPath [ stdenv.cc.cc curl - xorg.libX11 + libx11 stdenv.cc.libc - xorg.libXcursor + libxcursor "$out" ] }:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" $f diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index eab8dbafedad..66a26c9534bc 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -29,7 +29,14 @@ vulkan-loader, wrapGAppsHook3, xdg-utils, - xorg, + libxtst, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxcb, }: stdenv.mkDerivation rec { pname = "plasticity"; @@ -77,14 +84,14 @@ stdenv.mkDerivation rec { systemd libglvnd vulkan-loader # may help with nvidia users - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libXtst + libx11 + libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxtst ]; dontUnpack = true; diff --git a/pkgs/by-name/pl/plasticscm-client-gui/package.nix b/pkgs/by-name/pl/plasticscm-client-gui/package.nix index 59008bb453c5..8e3a57b9e488 100644 --- a/pkgs/by-name/pl/plasticscm-client-gui/package.nix +++ b/pkgs/by-name/pl/plasticscm-client-gui/package.nix @@ -50,11 +50,11 @@ buildFHSEnv { # Undocumented dependencies discovered from testing gtk3 - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXcursor - xorg.libXi + libice + libsm + libx11 + libxcursor + libxi ] ++ extraLibs pkgs; diff --git a/pkgs/by-name/pl/playonlinux/package.nix b/pkgs/by-name/pl/playonlinux/package.nix index 392ad5b1d38d..7fc0b612e470 100644 --- a/pkgs/by-name/pl/playonlinux/package.nix +++ b/pkgs/by-name/pl/playonlinux/package.nix @@ -22,7 +22,7 @@ which, curl, jq, - xorg, + libx11, libGL, steam-run, # needed for avoiding crash on file selector @@ -66,7 +66,7 @@ let libs = pkgs: lib.makeLibraryPath [ - xorg.libX11 + libx11 libGL ]; @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glib - xorg.libX11 + libx11 libGL python gsettings-desktop-schemas diff --git a/pkgs/by-name/pl/plex-desktop/package.nix b/pkgs/by-name/pl/plex-desktop/package.nix index a3a12c8e3598..063b03389c52 100644 --- a/pkgs/by-name/pl/plex-desktop/package.nix +++ b/pkgs/by-name/pl/plex-desktop/package.nix @@ -21,7 +21,18 @@ stdenv, writeShellScript, xkeyboard_config, - xorg, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxtst, + libxrender, + libxrandr, + libxinerama, + libxdamage, + libxcomposite, + xrandr, + libxshmfence, }: let pname = "plex-desktop"; @@ -75,18 +86,18 @@ let minizip nss stdenv.cc.cc - xorg.libXcomposite - xorg.libXdamage - xorg.libXinerama - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxshmfence - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - xorg.xrandr + libxcomposite + libxdamage + libxinerama + libxrandr + libxrender + libxtst + libxshmfence + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-wm + xrandr ]; strictDeps = true; diff --git a/pkgs/by-name/pl/plex-htpc/package.nix b/pkgs/by-name/pl/plex-htpc/package.nix index 9c7332c7c405..a6b568ec99e1 100644 --- a/pkgs/by-name/pl/plex-htpc/package.nix +++ b/pkgs/by-name/pl/plex-htpc/package.nix @@ -20,7 +20,18 @@ stdenv, writeShellScript, xkeyboard_config, - xorg, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxtst, + libxrender, + libxrandr, + libxinerama, + libxdamage, + libxcomposite, + xrandr, + libxshmfence, }: let pname = "plex-htpc"; @@ -65,18 +76,18 @@ let minizip nss stdenv.cc.cc - xorg.libXcomposite - xorg.libXdamage - xorg.libXinerama - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxshmfence - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - xorg.xrandr + libxcomposite + libxdamage + libxinerama + libxrandr + libxrender + libxtst + libxshmfence + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-wm + xrandr ]; strictDeps = true; diff --git a/pkgs/by-name/pl/plplot/package.nix b/pkgs/by-name/pl/plplot/package.nix index eae33774a01e..8282af36373f 100644 --- a/pkgs/by-name/pl/plplot/package.nix +++ b/pkgs/by-name/pl/plplot/package.nix @@ -7,7 +7,7 @@ enableWX ? false, wxGTK32, enableXWin ? false, - xorg, + libx11, enablePNG ? false, cairo, pango, @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional enableWX wxGTK32 - ++ lib.optional enableXWin xorg.libX11 + ++ lib.optional enableXWin libx11 ++ lib.optionals enablePNG [ cairo pango diff --git a/pkgs/by-name/pl/plymouth/package.nix b/pkgs/by-name/pl/plymouth/package.nix index 89607cd1bf3a..c9d0456f10c6 100644 --- a/pkgs/by-name/pl/plymouth/package.nix +++ b/pkgs/by-name/pl/plymouth/package.nix @@ -17,7 +17,7 @@ libxkbcommon, pango, systemd, - xorg, + xkeyboard-config, fontconfig, }: @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon pango systemd - xorg.xkeyboardconfig + xkeyboard-config ]; mesonFlags = diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix index b05500495092..149d9332e612 100644 --- a/pkgs/by-name/po/positron-bin/package.nix +++ b/pkgs/by-name/po/positron-bin/package.nix @@ -18,7 +18,10 @@ patchelf, openssl, stdenv, - xorg, + libxdamage, + libxcomposite, + libx11, + libxkbfile, }: let pname = "positron-bin"; @@ -57,10 +60,10 @@ stdenv.mkDerivation { nss stdenv.cc.cc openssl - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libxkbfile + libx11 + libxcomposite + libxdamage + libxkbfile ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ blas diff --git a/pkgs/by-name/po/posting/package.nix b/pkgs/by-name/po/posting/package.nix index cf897cd5022a..9aa6faded42c 100644 --- a/pkgs/by-name/po/posting/package.nix +++ b/pkgs/by-name/po/posting/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, python3Packages, - xorg, + xrdb, }: python3Packages.buildPythonApplication rec { pname = "posting"; @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { # Required for x resources themes buildInputs = [ - xorg.xrdb + xrdb ]; dependencies = diff --git a/pkgs/by-name/po/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix index 196ae0419a16..441f1a224a49 100644 --- a/pkgs/by-name/po/postman/linux.nix +++ b/pkgs/by-name/po/postman/linux.nix @@ -38,7 +38,8 @@ nss, pango, udev, - xorg, + libxshmfence, + libxcb, bintools, makeDesktopItem, # It's unknown which version of openssl that postman expects but it seems that @@ -140,8 +141,8 @@ stdenv.mkDerivation { nss pango udev - xorg.libxcb - xorg.libxshmfence + libxcb + libxshmfence ] }" $file done diff --git a/pkgs/by-name/po/powertop/package.nix b/pkgs/by-name/po/powertop/package.nix index 7c8aafec28e6..4c7550fa4ca7 100644 --- a/pkgs/by-name/po/powertop/package.nix +++ b/pkgs/by-name/po/powertop/package.nix @@ -12,7 +12,7 @@ pkg-config, powertop, testers, - xorg, + xset, zlib, }: @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/main.cpp --replace-fail "/sbin/modprobe" "modprobe" - substituteInPlace src/calibrate/calibrate.cpp --replace-fail "/usr/bin/xset" "${lib.getExe xorg.xset}" + substituteInPlace src/calibrate/calibrate.cpp --replace-fail "/usr/bin/xset" "${lib.getExe xset}" substituteInPlace src/tuning/bluetooth.cpp --replace-fail "/usr/bin/hcitool" "hcitool" ''; diff --git a/pkgs/by-name/pr/prl-tools/package.nix b/pkgs/by-name/pr/prl-tools/package.nix index 8617058f3d8f..7b7b719a530d 100644 --- a/pkgs/by-name/pr/prl-tools/package.nix +++ b/pkgs/by-name/pr/prl-tools/package.nix @@ -19,13 +19,18 @@ undmg, util-linux, wayland, - xorg, + libxrandr, + libxi, + libxinerama, + libxext, + libxcomposite, + libx11, }: let libPath = lib.concatStringsSep ":" [ "${glib.out}/lib" - "${xorg.libXrandr}/lib" + "${libxrandr}/lib" "${wayland.out}/lib" ]; scriptPath = lib.concatStringsSep ":" [ @@ -66,18 +71,18 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ fuse glib - xorg.libX11 - xorg.libXcomposite - xorg.libXext - xorg.libXrandr - xorg.libXi - xorg.libXinerama + libx11 + libxcomposite + libxext + libxrandr + libxi + libxinerama ]; runtimeDependencies = [ dbus glib - xorg.libXrandr + libxrandr ]; unpackPhase = '' diff --git a/pkgs/by-name/pr/profont/package.nix b/pkgs/by-name/pr/profont/package.nix index 92cc650efcf9..a21877cf9ca4 100644 --- a/pkgs/by-name/pr/profont/package.nix +++ b/pkgs/by-name/pr/profont/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchzip, - xorg, + mkfontscale, }: stdenv.mkDerivation { @@ -29,7 +29,7 @@ stdenv.mkDerivation { dontBuild = true; - nativeBuildInputs = [ xorg.mkfontscale ]; + nativeBuildInputs = [ mkfontscale ]; installPhase = '' mkdir -p "$out/share/fonts/misc" diff --git a/pkgs/by-name/pu/publii/package.nix b/pkgs/by-name/pu/publii/package.nix index fd00f5e4c14c..3ea5cc734695 100644 --- a/pkgs/by-name/pu/publii/package.nix +++ b/pkgs/by-name/pu/publii/package.nix @@ -23,7 +23,8 @@ pango, udev, xdg-utils, - xorg, + libx11, + libxcb, }: stdenv.mkDerivation rec { @@ -62,8 +63,8 @@ stdenv.mkDerivation rec { musl nss pango - xorg.libX11 - xorg.libxcb + libx11 + libxcb ]; unpackPhase = '' diff --git a/pkgs/by-name/pu/pugl/package.nix b/pkgs/by-name/pu/pugl/package.nix index 2af38bb31d1b..0c868d5b997a 100644 --- a/pkgs/by-name/pu/pugl/package.nix +++ b/pkgs/by-name/pu/pugl/package.nix @@ -4,7 +4,10 @@ meson, fetchFromGitHub, pkg-config, - xorg, + libxrandr, + libxext, + libxcursor, + libx11, libGL, cairo, glslang, @@ -45,13 +48,13 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libX11 - xorg.libXcursor - xorg.libXrandr + libx11 + libxcursor + libxrandr libGL vulkan-loader vulkan-headers - xorg.libXext + libxext cairo ]; diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix index fe56d2b32d66..4c01157127b3 100644 --- a/pkgs/by-name/pu/pulsar/package.nix +++ b/pkgs/by-name/pu/pulsar/package.nix @@ -18,7 +18,15 @@ libgbm, nss, nspr, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxshmfence, + libxkbfile, + libxcb, libdrm, libsecret, libxkbcommon, @@ -62,16 +70,16 @@ let nss nspr libdrm - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxshmfence + libx11 + libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxshmfence libxkbcommon - xorg.libxkbfile + libxkbfile pango stdenv.cc.cc systemd @@ -102,7 +110,7 @@ stdenv.mkDerivation { buildInputs = [ gtk3 - xorg.libxkbfile + libxkbfile ]; dontBuild = true; diff --git a/pkgs/by-name/pw/pw-viz/package.nix b/pkgs/by-name/pw/pw-viz/package.nix index 0ec5f14bec1d..069b2578a2e2 100644 --- a/pkgs/by-name/pw/pw-viz/package.nix +++ b/pkgs/by-name/pw/pw-viz/package.nix @@ -10,7 +10,10 @@ libxkbcommon, pipewire, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage rec { @@ -37,10 +40,10 @@ rustPlatform.buildRustPackage rec { pipewire rustPlatform.bindgenHook wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ]; postFixup = '' diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix index 5677c6e288c4..8f8e29ad5ae4 100644 --- a/pkgs/by-name/qq/qq/package.nix +++ b/pkgs/by-name/qq/qq/package.nix @@ -17,7 +17,7 @@ libpulseaudio, libGL, nss, - xorg, + libxdamage, systemd, stdenv, undmg, @@ -113,7 +113,7 @@ else libgbm nss vips - xorg.libXdamage + libxdamage ]; dontWrapGApps = true; diff --git a/pkgs/by-name/qq/qqmusic/package.nix b/pkgs/by-name/qq/qqmusic/package.nix index c242c0532c72..a87050b702cd 100644 --- a/pkgs/by-name/qq/qqmusic/package.nix +++ b/pkgs/by-name/qq/qqmusic/package.nix @@ -27,7 +27,18 @@ pango, pciutils, udev, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, }: ################################################################################ # Mostly based on qqmusic-bin package from AUR: @@ -69,18 +80,18 @@ stdenv.mkDerivation (finalAttrs: { pango pciutils udev - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst + libx11 + libxcb + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxscrnsaver + libxtst ]; unpackPhase = '' diff --git a/pkgs/by-name/qu/quartus-prime-lite/package.nix b/pkgs/by-name/qu/quartus-prime-lite/package.nix index 6322fc3a99b4..1e43f5fce8c6 100644 --- a/pkgs/by-name/qu/quartus-prime-lite/package.nix +++ b/pkgs/by-name/qu/quartus-prime-lite/package.nix @@ -50,19 +50,19 @@ buildFHSEnv rec { )) # quartus requirements glib - xorg.libICE - xorg.libSM - xorg.libXau - xorg.libXdmcp - xorg.libXScrnSaver + libice + libsm + libxau + libxdmcp + libxscrnsaver libudev0-shim bzip2 brotli expat dbus # qsys requirements - xorg.libXtst - xorg.libXi + libxtst + libxi dejavu_fonts gnumake ]; @@ -78,7 +78,7 @@ buildFHSEnv rec { # This seems ugly - can we override `libpng = libpng12` for all `pkgs`? freetype = pkgs.freetype.override { libpng = libpng12; }; fontconfig = pkgs.fontconfig.override { inherit freetype; }; - libXft = pkgs.xorg.libXft.override { inherit freetype fontconfig; }; + libXft = pkgs.libxft.override { inherit freetype fontconfig; }; in [ # questa requirements @@ -89,9 +89,9 @@ buildFHSEnv rec { # common requirements freetype fontconfig - xorg.libX11 - xorg.libXext - xorg.libXrender + libx11 + libxext + libxrender libxcrypt-legacy ]; diff --git a/pkgs/by-name/qu/quickshell/package.nix b/pkgs/by-name/qu/quickshell/package.nix index dbbe5f9ce567..ec536d246093 100644 --- a/pkgs/by-name/qu/quickshell/package.nix +++ b/pkgs/by-name/qu/quickshell/package.nix @@ -14,7 +14,7 @@ wayland, wayland-protocols, wayland-scanner, - xorg, + libxcb, libdrm, libgbm, pipewire, @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { libgbm breakpad jemalloc - xorg.libxcb + libxcb pam pipewire ]; diff --git a/pkgs/by-name/ra/raccoin/package.nix b/pkgs/by-name/ra/raccoin/package.nix index 1ed96a8ca165..f2d8963a4609 100644 --- a/pkgs/by-name/ra/raccoin/package.nix +++ b/pkgs/by-name/ra/raccoin/package.nix @@ -13,7 +13,10 @@ freetype, alsa-lib, libGL, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, openssl, nix-update-script, withWayland ? true, @@ -51,10 +54,10 @@ rustPlatform.buildRustPackage (finalAttrs: { wayland ] ++ lib.optionals withX11 [ - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ]; # upstream has no tests @@ -74,7 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: { libxkbcommon openssl ] - ++ lib.optional withX11 xorg.libX11 + ++ lib.optional withX11 libx11 ) }" \ $out/bin/raccoin diff --git a/pkgs/by-name/ra/radeontools/package.nix b/pkgs/by-name/ra/radeontools/package.nix index 4fa12b3ceb61..a7f4ebccbe1e 100644 --- a/pkgs/by-name/ra/radeontools/package.nix +++ b/pkgs/by-name/ra/radeontools/package.nix @@ -5,7 +5,7 @@ autoreconfHook, pciutils, pkg-config, - xorg, + libpciaccess, }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config ]; - buildInputs = [ xorg.libpciaccess ]; + buildInputs = [ libpciaccess ]; meta = { description = "Lowlevel tools to tweak register and dump state on radeon GPUs"; diff --git a/pkgs/by-name/ra/rapidraw/package.nix b/pkgs/by-name/ra/rapidraw/package.nix index a0464109488d..81bd053a8391 100644 --- a/pkgs/by-name/ra/rapidraw/package.nix +++ b/pkgs/by-name/ra/rapidraw/package.nix @@ -16,7 +16,14 @@ libappindicator, cairo, pango, - xorg, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxcursor, + libx11, + libxcb, libxkbcommon, vulkan-loader, libjpeg, @@ -77,14 +84,14 @@ rustPlatform.buildRustPackage (finalAttrs: { gdk-pixbuf cairo pango - xorg.libX11 - xorg.libXi - xorg.libXcursor - xorg.libXext - xorg.libXrandr - xorg.libXrender - xorg.libxcb - xorg.libXfixes + libx11 + libxi + libxcursor + libxext + libxrandr + libxrender + libxcb + libxfixes libxkbcommon vulkan-loader libjpeg diff --git a/pkgs/by-name/re/react-native-debugger/package.nix b/pkgs/by-name/re/react-native-debugger/package.nix index 56afb1b73ee2..b6062f32d77f 100644 --- a/pkgs/by-name/re/react-native-debugger/package.nix +++ b/pkgs/by-name/re/react-native-debugger/package.nix @@ -4,7 +4,18 @@ fetchurl, unzip, cairo, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, gdk-pixbuf, fontconfig, pango, @@ -52,18 +63,18 @@ let libxkbcommon libgbm - xorg.libX11 - xorg.libXcursor - xorg.libXtst - xorg.libxcb - xorg.libXext - xorg.libXi - xorg.libXdamage - xorg.libXrandr - xorg.libXcomposite - xorg.libXfixes - xorg.libXrender - xorg.libXScrnSaver + libx11 + libxcursor + libxtst + libxcb + libxext + libxi + libxdamage + libxrandr + libxcomposite + libxfixes + libxrender + libxscrnsaver ]; in stdenv.mkDerivation rec { diff --git a/pkgs/by-name/re/recaf-launcher/package.nix b/pkgs/by-name/re/recaf-launcher/package.nix index c828c98e2dd2..94e6edfa275c 100644 --- a/pkgs/by-name/re/recaf-launcher/package.nix +++ b/pkgs/by-name/re/recaf-launcher/package.nix @@ -20,15 +20,15 @@ buildFHSEnv { jar openjdk25 - xorg.libX11 + libx11 at-spi2-atk cairo gdk-pixbuf glib gtk3 pango - xorg.libXtst - xorg.libX11 + libxtst + libx11 xorg_sys_opengl ]; diff --git a/pkgs/by-name/re/restish/package.nix b/pkgs/by-name/re/restish/package.nix index 889fc1f69b05..ba8dce36df48 100644 --- a/pkgs/by-name/re/restish/package.nix +++ b/pkgs/by-name/re/restish/package.nix @@ -5,7 +5,11 @@ fetchFromGitHub, restish, testers, - xorg, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, }: buildGoModule rec { @@ -22,11 +26,11 @@ buildGoModule rec { vendorHash = "sha256-5+N6iL9wD5J/E6H5qn1InQR8bbuAlTOzPQn0sawVbrI="; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXrandr + libx11 + libxcursor + libxi + libxinerama + libxrandr ]; ldflags = [ diff --git a/pkgs/by-name/ri/ringboard/package.nix b/pkgs/by-name/ri/ringboard/package.nix index 0ba46a48be6b..baa518846b6c 100644 --- a/pkgs/by-name/ri/ringboard/package.nix +++ b/pkgs/by-name/ri/ringboard/package.nix @@ -6,7 +6,10 @@ libxkbcommon, libGL, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, makeWrapper, displayServer ? "x11", nixosTests, @@ -43,10 +46,10 @@ rustPlatform.buildRustPackage (finalAttrs: { libGL ] ++ lib.optionals (displayServer == "x11") [ - xorg.libXcursor - xorg.libXrandr - xorg.libXi - xorg.libX11 + libxcursor + libxrandr + libxi + libx11 ] ++ lib.optionals (displayServer == "wayland") [ wayland diff --git a/pkgs/by-name/ri/ripasso-cursive/package.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix index b3ea8c3a235c..fb5e4b50300b 100644 --- a/pkgs/by-name/ri/ripasso-cursive/package.nix +++ b/pkgs/by-name/ri/ripasso-cursive/package.nix @@ -15,7 +15,7 @@ libgpg-error, nettle, openssl, - xorg, + libxcb, nix-update-script, }: @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { libgpg-error nettle openssl - xorg.libxcb + libxcb ]; checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/rl/rlaunch/package.nix b/pkgs/by-name/rl/rlaunch/package.nix index 58d4fdf605f3..5ce9d370b7a8 100644 --- a/pkgs/by-name/rl/rlaunch/package.nix +++ b/pkgs/by-name/rl/rlaunch/package.nix @@ -2,7 +2,9 @@ lib, fetchFromGitHub, rustPlatform, - xorg, + libxinerama, + libxft, + libx11, }: rustPlatform.buildRustPackage rec { @@ -22,9 +24,9 @@ rustPlatform.buildRustPackage rec { postFixup = '' patchelf --set-rpath ${ lib.makeLibraryPath [ - xorg.libX11 - xorg.libXft - xorg.libXinerama + libx11 + libxft + libxinerama ] } $out/bin/rlaunch ''; diff --git a/pkgs/by-name/rn/rnnoise-plugin/package.nix b/pkgs/by-name/rn/rnnoise-plugin/package.nix index 04224a747f7e..a9138481c50c 100644 --- a/pkgs/by-name/rn/rnnoise-plugin/package.nix +++ b/pkgs/by-name/rn/rnnoise-plugin/package.nix @@ -8,7 +8,8 @@ pcre, pkg-config, webkitgtk_4_1, - xorg, + libxrandr, + libx11, }: stdenv.mkDerivation rec { pname = "rnnoise-plugin"; @@ -42,8 +43,8 @@ stdenv.mkDerivation rec { freetype gtk3-x11 pcre - xorg.libX11 - xorg.libXrandr + libx11 + libxrandr ] ++ lib.optionals stdenv.hostPlatform.isLinux [ webkitgtk_4_1 diff --git a/pkgs/by-name/ro/robo3t/package.nix b/pkgs/by-name/ro/robo3t/package.nix index 908532859156..f3e026f013fd 100644 --- a/pkgs/by-name/ro/robo3t/package.nix +++ b/pkgs/by-name/ro/robo3t/package.nix @@ -5,7 +5,13 @@ curlWithGnuTls, zlib, glib, - xorg, + libxrender, + libxi, + libxext, + libx11, + libsm, + libice, + libxcb, dbus, fontconfig, libGL, @@ -49,13 +55,13 @@ stdenv.mkDerivation rec { stdenv.cc.cc zlib glib - xorg.libXi - xorg.libxcb - xorg.libXrender - xorg.libX11 - xorg.libSM - xorg.libICE - xorg.libXext + libxi + libxcb + libxrender + libx11 + libsm + libice + libxext dbus fontconfig freetype diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix index 1871c71f61be..6e64db1d9e9f 100644 --- a/pkgs/by-name/ro/root/package.nix +++ b/pkgs/by-name/ro/root/package.nix @@ -25,7 +25,10 @@ llvm_20, lsof, lz4, - xorg, + libxpm, + libxft, + libxext, + libx11, xz, man, openssl, @@ -116,10 +119,10 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGLU libGL - xorg.libX11 - xorg.libXpm - xorg.libXft - xorg.libXext + libx11 + libxpm + libxft + libxext ]; preConfigure = '' diff --git a/pkgs/by-name/rt/rtabmap/package.nix b/pkgs/by-name/rt/rtabmap/package.nix index 51561509629c..53eb9990375e 100644 --- a/pkgs/by-name/rt/rtabmap/package.nix +++ b/pkgs/by-name/rt/rtabmap/package.nix @@ -14,7 +14,9 @@ opencv, pcl, liblapack, - xorg, + libxt, + libsm, + libice, libusb1, yaml-cpp, libnabo, @@ -61,9 +63,9 @@ stdenv.mkDerivation (finalAttrs: { opencv.cxxdev pcl' liblapack - xorg.libSM - xorg.libICE - xorg.libXt + libsm + libice + libxt ## Optional libusb1 diff --git a/pkgs/by-name/ru/runelite/package.nix b/pkgs/by-name/ru/runelite/package.nix index 883d5945183a..0d4e0a721e8c 100644 --- a/pkgs/by-name/ru/runelite/package.nix +++ b/pkgs/by-name/ru/runelite/package.nix @@ -6,7 +6,7 @@ maven, jdk17, jre, - xorg, + libxxf86vm, gitUpdater, libGL, }: @@ -53,7 +53,7 @@ maven.buildMavenPackage rec { makeWrapper ${jre}/bin/java $out/bin/runelite \ --prefix LD_LIBRARY_PATH : "${ lib.makeLibraryPath [ - xorg.libXxf86vm + libxxf86vm libGL ] }" \ diff --git a/pkgs/by-name/ru/runescape/package.nix b/pkgs/by-name/ru/runescape/package.nix index 16aaec3a34a7..9800887843ad 100644 --- a/pkgs/by-name/ru/runescape/package.nix +++ b/pkgs/by-name/ru/runescape/package.nix @@ -131,7 +131,7 @@ buildFHSEnv { pango SDL2 xdg-utils - xorg.libX11 + libx11 xorg_sys_opengl zlib ]; diff --git a/pkgs/by-name/ru/rusty-path-of-building/package.nix b/pkgs/by-name/ru/rusty-path-of-building/package.nix index 67dffb8f31bf..4da250b7f62c 100644 --- a/pkgs/by-name/ru/rusty-path-of-building/package.nix +++ b/pkgs/by-name/ru/rusty-path-of-building/package.nix @@ -13,7 +13,9 @@ libxkbcommon, vulkan-loader, wayland, - xorg, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage rec { pname = "rusty-path-of-building"; @@ -66,9 +68,9 @@ rustPlatform.buildRustPackage rec { libxkbcommon vulkan-loader wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi + libx11 + libxcursor + libxi ] } diff --git a/pkgs/by-name/ru/rusty-psn/package.nix b/pkgs/by-name/ru/rusty-psn/package.nix index 4ce2c02cd5ce..6bb7a8add975 100644 --- a/pkgs/by-name/ru/rusty-psn/package.nix +++ b/pkgs/by-name/ru/rusty-psn/package.nix @@ -11,7 +11,11 @@ gtk3, freetype, openssl, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, + libxcb, libGL, libxkbcommon, wayland, @@ -51,12 +55,12 @@ rustPlatform.buildRustPackage rec { gtk3 freetype openssl - xorg.libxcb - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXi - xorg.libxcb + libxcb + libx11 + libxcursor + libxrandr + libxi + libxcb libGL libxkbcommon wayland diff --git a/pkgs/by-name/rx/rx/package.nix b/pkgs/by-name/rx/rx/package.nix index a38261d246f8..234a3b4ea11f 100644 --- a/pkgs/by-name/rx/rx/package.nix +++ b/pkgs/by-name/rx/rx/package.nix @@ -6,7 +6,12 @@ makeWrapper, cmake, pkg-config, - xorg ? null, + libxrandr, + libxi, + libxinerama, + libxext, + libxcursor, + libx11, libGL ? null, }: @@ -31,12 +36,12 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ # glfw-sys dependencies: - xorg.libX11 - xorg.libXrandr - xorg.libXinerama - xorg.libXcursor - xorg.libXi - xorg.libXext + libx11 + libxrandr + libxinerama + libxcursor + libxi + libxext ]; # FIXME: GLFW (X11) requires DISPLAY env variable for all tests diff --git a/pkgs/by-name/ry/rymdport/package.nix b/pkgs/by-name/ry/rymdport/package.nix index e4889a94d303..f0f8ff50cc1e 100644 --- a/pkgs/by-name/ry/rymdport/package.nix +++ b/pkgs/by-name/ry/rymdport/package.nix @@ -4,7 +4,13 @@ fetchFromGitHub, pkg-config, libGL, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxext, + libxcursor, + libx11, }: buildGoModule rec { @@ -26,13 +32,13 @@ buildGoModule rec { buildInputs = [ libGL - xorg.libX11 - xorg.libXcursor - xorg.libXext - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.libXxf86vm + libx11 + libxcursor + libxext + libxi + libxinerama + libxrandr + libxxf86vm ]; postInstall = '' diff --git a/pkgs/by-name/s0/s0ix-selftest-tool/package.nix b/pkgs/by-name/s0/s0ix-selftest-tool/package.nix index 92f8fca93469..cc36bc17e22b 100644 --- a/pkgs/by-name/s0/s0ix-selftest-tool/package.nix +++ b/pkgs/by-name/s0/s0ix-selftest-tool/package.nix @@ -14,7 +14,7 @@ stdenv, unstableGitUpdater, util-linux, - xorg, + xset, xxd, }: @@ -30,7 +30,7 @@ let pciutils powertop util-linux - xorg.xset + xset xxd ]; in diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix index cb8665cc7711..523f863c1d3d 100644 --- a/pkgs/by-name/sa/saber/package.nix +++ b/pkgs/by-name/sa/saber/package.nix @@ -7,7 +7,7 @@ orc, webkitgtk_4_1, autoPatchelfHook, - xorg, + libxmu, jdk, zlib, runCommand, @@ -49,7 +49,7 @@ flutter338.buildFlutterApplication { libunwind orc webkitgtk_4_1 - xorg.libXmu + libxmu jdk ]; diff --git a/pkgs/by-name/sa/safecloset/package.nix b/pkgs/by-name/sa/safecloset/package.nix index d4fefc1961f3..cb8932ce1fa3 100644 --- a/pkgs/by-name/sa/safecloset/package.nix +++ b/pkgs/by-name/sa/safecloset/package.nix @@ -3,7 +3,7 @@ rustPlatform, fetchFromGitHub, stdenv, - xorg, + libxcb, }: rustPlatform.buildRustPackage rec { @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-BSWUWB8OrdmDtU+cGCVp75hakpdd9G3cs9ythDn4nnY="; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libxcb + libxcb ]; checkFlags = [ diff --git a/pkgs/by-name/sa/saleae-logic-2/package.nix b/pkgs/by-name/sa/saleae-logic-2/package.nix index 44fa021d0b0b..116ee9e316df 100644 --- a/pkgs/by-name/sa/saleae-logic-2/package.nix +++ b/pkgs/by-name/sa/saleae-logic-2/package.nix @@ -41,16 +41,16 @@ appimageTools.wrapType2 { wget unzip glib - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrender - xorg.libXtst + libx11 + libxcb + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrender + libxtst nss nspr dbus @@ -60,8 +60,8 @@ appimageTools.wrapType2 { atk cairo expat - xorg.libXrandr - xorg.libXScrnSaver + libxrandr + libxscrnsaver alsa-lib at-spi2-core cups diff --git a/pkgs/by-name/sa/sauerbraten/package.nix b/pkgs/by-name/sa/sauerbraten/package.nix index 93e8af7faf7a..e5004773ee3c 100644 --- a/pkgs/by-name/sa/sauerbraten/package.nix +++ b/pkgs/by-name/sa/sauerbraten/package.nix @@ -12,7 +12,7 @@ SDL2, SDL2_image, SDL2_mixer, - xorg, + libx11, zlib, makeDesktopItem, @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { SDL2 SDL2_image SDL2_mixer - xorg.libX11 + libx11 zlib ]; diff --git a/pkgs/by-name/sc/scilab-bin/package.nix b/pkgs/by-name/sc/scilab-bin/package.nix index 061719afbd94..9371ace75235 100644 --- a/pkgs/by-name/sc/scilab-bin/package.nix +++ b/pkgs/by-name/sc/scilab-bin/package.nix @@ -7,7 +7,15 @@ autoPatchelfHook, alsa-lib, ncurses5, - xorg, + libxxf86vm, + libxtst, + libxrender, + libxrandr, + libxi, + libxft, + libxext, + libxcursor, + libx11, }: let @@ -88,15 +96,15 @@ let alsa-lib ncurses5 stdenv.cc.cc - xorg.libX11 - xorg.libXcursor - xorg.libXext - xorg.libXft - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libXxf86vm + libx11 + libxcursor + libxext + libxft + libxi + libxrandr + libxrender + libxtst + libxxf86vm ]; installPhase = '' diff --git a/pkgs/by-name/sc/screen-pipe/package.nix b/pkgs/by-name/sc/screen-pipe/package.nix index e67a07584be4..0231c0568eed 100644 --- a/pkgs/by-name/sc/screen-pipe/package.nix +++ b/pkgs/by-name/sc/screen-pipe/package.nix @@ -10,7 +10,7 @@ sqlite, stdenv, alsa-lib, - xorg, + libxcb, }: rustPlatform.buildRustPackage rec { pname = "screen-pipe"; @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - xorg.libxcb + libxcb ]; buildFeatures = lib.optional stdenv.hostPlatform.isDarwin "metal"; diff --git a/pkgs/by-name/sc/screenkey/package.nix b/pkgs/by-name/sc/screenkey/package.nix index 0fbb9d3d2d49..9a909ebf2c92 100644 --- a/pkgs/by-name/sc/screenkey/package.nix +++ b/pkgs/by-name/sc/screenkey/package.nix @@ -2,7 +2,8 @@ lib, fetchFromGitLab, wrapGAppsHook3, - xorg, + libxtst, + libx11, gobject-introspection, gtk3, libappindicator-gtk3, @@ -60,8 +61,8 @@ python3.pkgs.buildPythonApplication rec { # Fix CDLL python calls for non absolute paths of xorg libraries postPatch = '' substituteInPlace Screenkey/xlib.py \ - --replace-fail libX11.so.6 ${lib.getLib xorg.libX11}/lib/libX11.so.6 \ - --replace-fail libXtst.so.6 ${lib.getLib xorg.libXtst}/lib/libXtst.so.6 + --replace-fail libX11.so.6 ${lib.getLib libx11}/lib/libX11.so.6 \ + --replace-fail libXtst.so.6 ${lib.getLib libxtst}/lib/libXtst.so.6 ''; meta = { diff --git a/pkgs/by-name/se/seamly2d/package.nix b/pkgs/by-name/se/seamly2d/package.nix index 038e8e2104ca..bbfc260e16d6 100644 --- a/pkgs/by-name/se/seamly2d/package.nix +++ b/pkgs/by-name/se/seamly2d/package.nix @@ -9,7 +9,9 @@ xvfb-run, fontconfig, freetype, - xorg, + libxrender, + libxi, + libxcb, python3, git, }: @@ -37,9 +39,9 @@ stdenv.mkDerivation rec { libsForQt5.qtsvg libgbm freetype - xorg.libXi - xorg.libXrender - xorg.libxcb + libxi + libxrender + libxcb ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/segger-jlink/qt4-bundled.nix b/pkgs/by-name/se/segger-jlink/qt4-bundled.nix index 1afaf09c4358..e3cc217895f9 100644 --- a/pkgs/by-name/se/segger-jlink/qt4-bundled.nix +++ b/pkgs/by-name/se/segger-jlink/qt4-bundled.nix @@ -5,7 +5,12 @@ version, autoPatchelfHook, fontconfig, - xorg, + libxrandr, + libxfixes, + libxcursor, + libx11, + libsm, + libice, }: stdenv.mkDerivation { @@ -19,12 +24,12 @@ stdenv.mkDerivation { buildInputs = [ (lib.getLib stdenv.cc.cc) fontconfig - xorg.libXrandr - xorg.libXfixes - xorg.libXcursor - xorg.libSM - xorg.libICE - xorg.libX11 + libxrandr + libxfixes + libxcursor + libsm + libice + libx11 ]; dontConfigure = true; diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix index fd6b64e8ea70..286d061bb517 100644 --- a/pkgs/by-name/se/servo/package.nix +++ b/pkgs/by-name/se/servo/package.nix @@ -34,7 +34,11 @@ udev, vulkan-loader, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, + libxcb, zlib, # tests @@ -52,9 +56,9 @@ let ); runtimePaths = lib.makeLibraryPath ( lib.optionals (stdenv.hostPlatform.isLinux) [ - xorg.libXcursor - xorg.libXrandr - xorg.libXi + libxcursor + libxrandr + libxi libxkbcommon vulkan-loader wayland @@ -127,8 +131,8 @@ rustPlatform.buildRustPackage (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland - xorg.libX11 - xorg.libxcb + libx11 + libxcb udev vulkan-loader ]; diff --git a/pkgs/by-name/sf/sfizz-ui/package.nix b/pkgs/by-name/sf/sfizz-ui/package.nix index 68b30ee36caa..fbcd0224466c 100644 --- a/pkgs/by-name/sf/sfizz-ui/package.nix +++ b/pkgs/by-name/sf/sfizz-ui/package.nix @@ -4,7 +4,15 @@ fetchFromGitHub, libjack2, libsndfile, - xorg, + libxcb-util, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxcb-cursor, + libxdmcp, + libxau, + libx11, + libxcb, freetype, libxkbcommon, cairo, @@ -45,15 +53,15 @@ stdenv.mkDerivation (finalAttrs: { libvorbis libxkbcommon pango - xorg.libX11 - xorg.libXau - xorg.libxcb - xorg.libXdmcp - xorg.xcbutil - xorg.xcbutilcursor - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil + libx11 + libxau + libxcb + libxdmcp + libxcb-util + libxcb-cursor + libxcb-image + libxcb-keysyms + libxcb-render-util zenity ]; diff --git a/pkgs/by-name/sf/sfizz/package.nix b/pkgs/by-name/sf/sfizz/package.nix index 931331a559b0..764a6e239fd4 100644 --- a/pkgs/by-name/sf/sfizz/package.nix +++ b/pkgs/by-name/sf/sfizz/package.nix @@ -4,7 +4,15 @@ fetchFromGitHub, libjack2, libsndfile, - xorg, + libxcb-util, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxcb-cursor, + libxdmcp, + libxau, + libx11, + libxcb, freetype, libxkbcommon, cairo, @@ -39,15 +47,15 @@ stdenv.mkDerivation (finalAttrs: { libogg libvorbis libopus - xorg.libX11 - xorg.libxcb - xorg.libXau - xorg.libXdmcp - xorg.xcbutil - xorg.xcbutilcursor - xorg.xcbutilrenderutil - xorg.xcbutilkeysyms - xorg.xcbutilimage + libx11 + libxcb + libxau + libxdmcp + libxcb-util + libxcb-cursor + libxcb-render-util + libxcb-keysyms + libxcb-image libxkbcommon cairo glib diff --git a/pkgs/by-name/sh/shadershark/package.nix b/pkgs/by-name/sh/shadershark/package.nix index 76967ac90caf..617099efd266 100644 --- a/pkgs/by-name/sh/shadershark/package.nix +++ b/pkgs/by-name/sh/shadershark/package.nix @@ -3,7 +3,7 @@ lib, fetchhg, libepoxy, - xorg, + libx11, libGLU, glm, pkg-config, @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libepoxy - xorg.libX11 + libx11 libGLU glm imagemagick diff --git a/pkgs/by-name/sh/shticker-book-unwritten/package.nix b/pkgs/by-name/sh/shticker-book-unwritten/package.nix index 786e7fc1bff8..658926290fae 100644 --- a/pkgs/by-name/sh/shticker-book-unwritten/package.nix +++ b/pkgs/by-name/sh/shticker-book-unwritten/package.nix @@ -17,9 +17,9 @@ buildFHSEnv { libglvnd libpulseaudio shticker-book-unwritten-unwrapped - xorg.libX11 - xorg.libXcursor - xorg.libXext + libx11 + libxcursor + libxext ]; runScript = "shticker_book_unwritten"; diff --git a/pkgs/by-name/si/sidequest/package.nix b/pkgs/by-name/si/sidequest/package.nix index 9bc2341ac105..48f318d1e4bd 100644 --- a/pkgs/by-name/si/sidequest/package.nix +++ b/pkgs/by-name/si/sidequest/package.nix @@ -20,7 +20,14 @@ nss, nspr, libdrm, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxkbfile, + libxcb, libxkbcommon, libxshmfence, pango, @@ -93,16 +100,16 @@ let nss nspr libdrm - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxshmfence + libx11 + libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxshmfence libxkbcommon - xorg.libxkbfile + libxkbfile pango (lib.getLib stdenv.cc.cc) systemd diff --git a/pkgs/by-name/si/signal-desktop-bin/generic.nix b/pkgs/by-name/si/signal-desktop-bin/generic.nix index 47902c4911cf..4fd493934f35 100644 --- a/pkgs/by-name/si/signal-desktop-bin/generic.nix +++ b/pkgs/by-name/si/signal-desktop-bin/generic.nix @@ -23,7 +23,8 @@ fontconfig, dbus, libX11, - xorg, + libxshmfence, + libxcb, libXi, libXcursor, libXdamage, @@ -187,8 +188,8 @@ stdenv.mkDerivation rec { nss pango systemdLibs - xorg.libxcb - xorg.libxshmfence + libxcb + libxshmfence ]; runtimeDependencies = [ diff --git a/pkgs/by-name/si/siji/package.nix b/pkgs/by-name/si/siji/package.nix index ce144d22d0e8..288b7e8446df 100644 --- a/pkgs/by-name/si/siji/package.nix +++ b/pkgs/by-name/si/siji/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, libfaketime, - xorg, + mkfontscale, + fonttosfnt, }: stdenv.mkDerivation { @@ -19,8 +20,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ libfaketime - xorg.fonttosfnt - xorg.mkfontscale + fonttosfnt + mkfontscale ]; buildPhase = '' diff --git a/pkgs/by-name/si/sitespeed-io/package.nix b/pkgs/by-name/si/sitespeed-io/package.nix index 835a68bd266b..e78e793b8252 100644 --- a/pkgs/by-name/si/sitespeed-io/package.nix +++ b/pkgs/by-name/si/sitespeed-io/package.nix @@ -10,7 +10,7 @@ procps, python3, versionCheckHook, - xorg, + xorg-server, nix-update-script, # chromedriver is more efficient than geckodriver, but is available on less platforms. @@ -85,7 +85,7 @@ buildNpmPackage (finalAttrs: { ])) ffmpeg-headless imagemagick_light - xorg.xorgserver + xorg-server procps coreutils ] diff --git a/pkgs/by-name/sl/slack/linux.nix b/pkgs/by-name/sl/slack/linux.nix index 03f6f10b21d0..dcd57b9145c3 100644 --- a/pkgs/by-name/sl/slack/linux.nix +++ b/pkgs/by-name/sl/slack/linux.nix @@ -40,7 +40,19 @@ systemd, wayland, xdg-utils, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxshmfence, + libxkbfile, }: stdenv.mkDerivation rec { inherit @@ -83,19 +95,19 @@ stdenv.mkDerivation rec { stdenv.cc.cc systemd wayland - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxkbfile - xorg.libxshmfence + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxkbfile + libxshmfence ] + ":${lib.getLib stdenv.cc.cc}/lib64"; diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix index ff24feebaa9b..f149fc0cd211 100644 --- a/pkgs/by-name/sl/slint-lsp/package.nix +++ b/pkgs/by-name/sl/slint-lsp/package.nix @@ -7,7 +7,10 @@ cmake, fontconfig, libGL, - xorg, + libxi, + libxcursor, + libx11, + libxcb, libxkbcommon, wayland, versionCheckHook, @@ -27,10 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: { rpathLibs = [ fontconfig libGL - xorg.libxcb - xorg.libX11 - xorg.libXcursor - xorg.libXi + libxcb + libx11 + libxcursor + libxi ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon @@ -42,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pkg-config fontconfig ]; - buildInputs = finalAttrs.rpathLibs ++ [ xorg.libxcb.dev ]; + buildInputs = finalAttrs.rpathLibs ++ [ libxcb.dev ]; # Tests requires `i_slint_backend_testing` which is only a dev dependency doCheck = false; diff --git a/pkgs/by-name/sn/snake4/package.nix b/pkgs/by-name/sn/snake4/package.nix index ae198bb32c1e..53a8c232c93e 100644 --- a/pkgs/by-name/sn/snake4/package.nix +++ b/pkgs/by-name/sn/snake4/package.nix @@ -4,7 +4,11 @@ fetchurl, shhmsg, shhopt, - xorg, + libxt, + libxpm, + libxext, + libxaw, + libx11, }: stdenv.mkDerivation rec { @@ -19,11 +23,11 @@ stdenv.mkDerivation rec { buildInputs = [ shhmsg shhopt - xorg.libX11 - xorg.libXt - xorg.libXpm - xorg.libXaw - xorg.libXext + libx11 + libxt + libxpm + libxaw + libxext ]; preInstall = '' diff --git a/pkgs/by-name/sn/snd/package.nix b/pkgs/by-name/sn/snd/package.nix index 7ca43cc47689..140231f348dc 100644 --- a/pkgs/by-name/sn/snd/package.nix +++ b/pkgs/by-name/sn/snd/package.nix @@ -7,7 +7,10 @@ fftw, gsl, motif, - xorg, + libxt, + libxpm, + libxft, + libxext, }: stdenv.mkDerivation rec { @@ -32,10 +35,10 @@ stdenv.mkDerivation rec { alsa-lib ] ++ [ - xorg.libXext - xorg.libXft - xorg.libXpm - xorg.libXt + libxext + libxft + libxpm + libxt ]; configureFlags = [ diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix index d092483c5c25..d6082f9bd407 100644 --- a/pkgs/by-name/sn/sniffnet/package.nix +++ b/pkgs/by-name/sn/sniffnet/package.nix @@ -14,7 +14,10 @@ expat, fontconfig, vulkan-loader, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, # wrapper libxkbcommon, @@ -48,10 +51,10 @@ rustPlatform.buildRustPackage (finalAttrs: { expat fontconfig vulkan-loader - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook @@ -78,7 +81,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --add-rpath ${ lib.makeLibraryPath [ vulkan-loader - xorg.libX11 + libx11 libxkbcommon wayland ] diff --git a/pkgs/by-name/sn/snippetexpandergui/package.nix b/pkgs/by-name/sn/snippetexpandergui/package.nix index 6a1f172e7617..fe3ec8fc3282 100644 --- a/pkgs/by-name/sn/snippetexpandergui/package.nix +++ b/pkgs/by-name/sn/snippetexpandergui/package.nix @@ -5,7 +5,7 @@ wails, scdoc, installShellFiles, - xorg, + libx11, gtk3, # webkitgtk_4_0, snippetexpanderd, @@ -31,7 +31,7 @@ buildGoModule rec { ]; buildInputs = [ - xorg.libX11 + libx11 gtk3 # webkitgtk_4_0 snippetexpanderd diff --git a/pkgs/by-name/sn/snippetexpanderx/package.nix b/pkgs/by-name/sn/snippetexpanderx/package.nix index 973833c95526..f460b97e231a 100644 --- a/pkgs/by-name/sn/snippetexpanderx/package.nix +++ b/pkgs/by-name/sn/snippetexpanderx/package.nix @@ -12,7 +12,7 @@ gtk3, ibus, libgee, - xorg, + libx11, snippetexpanderd, }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { gtk3 ibus libgee - xorg.libX11 + libx11 snippetexpanderd ]; diff --git a/pkgs/by-name/sn/snippetpixie/package.nix b/pkgs/by-name/sn/snippetpixie/package.nix index 68ed6474a69c..e4bbde3ba65f 100644 --- a/pkgs/by-name/sn/snippetpixie/package.nix +++ b/pkgs/by-name/sn/snippetpixie/package.nix @@ -21,7 +21,7 @@ ibus, json-glib, pantheon, - xorg, + libxtst, }: stdenv.mkDerivation rec { @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { dbus ibus json-glib - xorg.libXtst + libxtst pantheon.granite ]; diff --git a/pkgs/by-name/sn/snowemu/package.nix b/pkgs/by-name/sn/snowemu/package.nix index 91d3ff01103c..1679896fe118 100644 --- a/pkgs/by-name/sn/snowemu/package.nix +++ b/pkgs/by-name/sn/snowemu/package.nix @@ -6,7 +6,10 @@ makeDesktopItem, SDL2, pkg-config, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, wayland, libxkbcommon, libGL, @@ -32,10 +35,10 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ SDL2.dev - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXi + libx11 + libxcursor + libxrandr + libxi ]; postInstall = '' diff --git a/pkgs/by-name/so/socalabs-sid/package.nix b/pkgs/by-name/so/socalabs-sid/package.nix index 31cdba5fd795..bc9a6d7dcdaf 100644 --- a/pkgs/by-name/so/socalabs-sid/package.nix +++ b/pkgs/by-name/so/socalabs-sid/package.nix @@ -7,7 +7,14 @@ alsa-lib, copyDesktopItems, makeDesktopItem, - xorg, + libxtst, + libxrandr, + libxinerama, + libxdmcp, + libxcursor, + libxcomposite, + libx11, + xvfb, freetype, expat, libGL, @@ -71,14 +78,14 @@ stdenv.mkDerivation { buildInputs = [ alsa-lib - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXinerama - xorg.libXrandr - xorg.libXtst - xorg.libXdmcp - xorg.xvfb + libx11 + libxcomposite + libxcursor + libxinerama + libxrandr + libxtst + libxdmcp + xvfb libGL libjack2 libsysprof-capture diff --git a/pkgs/by-name/so/sointu/package.nix b/pkgs/by-name/so/sointu/package.nix index 0d54cdda4cff..b3e096f0e104 100644 --- a/pkgs/by-name/so/sointu/package.nix +++ b/pkgs/by-name/so/sointu/package.nix @@ -10,7 +10,9 @@ libxkbcommon, vulkan-headers, wayland, - xorg, + libxfixes, + libxcursor, + libx11, }: buildGoModule rec { @@ -35,9 +37,9 @@ buildGoModule rec { libxkbcommon vulkan-headers wayland - xorg.libX11 - xorg.libXcursor - xorg.libXfixes + libx11 + libxcursor + libxfixes ]; proxyVendor = true; diff --git a/pkgs/by-name/so/solvespace/package.nix b/pkgs/by-name/so/solvespace/package.nix index 589da2f5d793..b42755b4347b 100644 --- a/pkgs/by-name/so/solvespace/package.nix +++ b/pkgs/by-name/so/solvespace/package.nix @@ -26,7 +26,9 @@ pangomm, pcre, util-linuxMinimal, # provides libmount - xorg, + libxtst, + libxdmcp, + libpthread-stubs, zlib, }: @@ -70,9 +72,9 @@ stdenv.mkDerivation rec { pangomm pcre util-linuxMinimal - xorg.libpthreadstubs - xorg.libXdmcp - xorg.libXtst + libpthread-stubs + libxdmcp + libxtst zlib ]; diff --git a/pkgs/by-name/so/sommelier/package.nix b/pkgs/by-name/so/sommelier/package.nix index 21bf11036ed5..42cebc1332df 100644 --- a/pkgs/by-name/so/sommelier/package.nix +++ b/pkgs/by-name/so/sommelier/package.nix @@ -11,7 +11,7 @@ libxkbcommon, libgbm, pixman, - xorg, + libxcb, wayland, gtest, }: @@ -40,7 +40,7 @@ stdenv.mkDerivation { libgbm pixman wayland - xorg.libxcb + libxcb ]; preConfigure = '' diff --git a/pkgs/by-name/sp/spleen/package.nix b/pkgs/by-name/sp/spleen/package.nix index eadf8cfa3791..51a925edc585 100644 --- a/pkgs/by-name/sp/spleen/package.nix +++ b/pkgs/by-name/sp/spleen/package.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchurl, - xorg, + mkfontscale, }: stdenvNoCC.mkDerivation rec { @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-i0fFbxpuuFj7z540UwVXQEsC+7NFXjjmT7hEc/0MNy8="; }; - nativeBuildInputs = [ xorg.mkfontscale ]; + nativeBuildInputs = [ mkfontscale ]; dontBuild = true; diff --git a/pkgs/by-name/sp/spotify/linux.nix b/pkgs/by-name/sp/spotify/linux.nix index a706ca4117a5..4cd35891eed7 100644 --- a/pkgs/by-name/sp/spotify/linux.nix +++ b/pkgs/by-name/sp/spotify/linux.nix @@ -3,7 +3,21 @@ lib, stdenv, squashfsTools, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libsm, + libice, + libxshmfence, + libxcb, alsa-lib, makeShellWrapper, wrapGAppsHook3, @@ -79,21 +93,21 @@ let pango stdenv.cc.cc systemd - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libxshmfence - xorg.libXtst + libice + libsm + libx11 + libxcb + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxscrnsaver + libxshmfence + libxtst zlib ]; in diff --git a/pkgs/by-name/st/stardust-xr-server/package.nix b/pkgs/by-name/st/stardust-xr-server/package.nix index 66acec53769f..fa2a6700256b 100644 --- a/pkgs/by-name/st/stardust-xr-server/package.nix +++ b/pkgs/by-name/st/stardust-xr-server/package.nix @@ -11,7 +11,8 @@ libgbm, openxr-loader, pkg-config, - xorg, + libxfixes, + libx11, }: rustPlatform.buildRustPackage rec { @@ -39,8 +40,8 @@ rustPlatform.buildRustPackage rec { libxkbcommon libgbm openxr-loader - xorg.libX11 - xorg.libXfixes + libx11 + libxfixes ]; CPM_SOURCE_CACHE = "./build"; diff --git a/pkgs/by-name/st/starsector/package.nix b/pkgs/by-name/st/starsector/package.nix index 9c4cec38b960..0d2cde228e2e 100644 --- a/pkgs/by-name/st/starsector/package.nix +++ b/pkgs/by-name/st/starsector/package.nix @@ -6,7 +6,8 @@ openal, openjdk17, stdenv, - xorg, + libxxf86vm, + xrandr, copyDesktopItems, makeDesktopItem, writeScript, @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xorg.libXxf86vm + libxxf86vm openal libGL ]; @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${ lib.makeBinPath [ openjdk - xorg.xrandr + xrandr ] } \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} \ diff --git a/pkgs/by-name/st/staruml/package.nix b/pkgs/by-name/st/staruml/package.nix index 8bcfe77a47fa..797248ff35af 100644 --- a/pkgs/by-name/st/staruml/package.nix +++ b/pkgs/by-name/st/staruml/package.nix @@ -8,7 +8,18 @@ gtk3, glib, systemd, - xorg, + libxtst, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxshmfence, + libxcb, nss, nspr, atk, @@ -75,17 +86,17 @@ stdenv.mkDerivation (finalAttrs: { lib.makeLibraryPath [ glib gtk3 - xorg.libXdamage - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrender - xorg.libXtst - xorg.libxshmfence + libxdamage + libx11 + libxcb + libxcomposite + libxcursor + libxext + libxfixes + libxi + libxrender + libxtst + libxshmfence libxkbcommon nss nspr @@ -95,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { gdk-pixbuf pango cairo - xorg.libXrandr + libxrandr expat libdrm libgbm diff --git a/pkgs/by-name/st/steam/package.nix b/pkgs/by-name/st/steam/package.nix index f1cd1abe3fef..254bf591334d 100644 --- a/pkgs/by-name/st/steam/package.nix +++ b/pkgs/by-name/st/steam/package.nix @@ -65,7 +65,7 @@ let # crashes on startup if it can't find libX11 locale files (pkgs.runCommand "xorg-locale" { } '' mkdir -p $out - ln -s ${xorg.libX11}/share $out/share + ln -s ${libx11}/share $out/share '') ] ++ extraPkgs pkgs; diff --git a/pkgs/by-name/st/steamtinkerlaunch/package.nix b/pkgs/by-name/st/steamtinkerlaunch/package.nix index 74defb2222a0..e6f25ff7f7d3 100644 --- a/pkgs/by-name/st/steamtinkerlaunch/package.nix +++ b/pkgs/by-name/st/steamtinkerlaunch/package.nix @@ -14,7 +14,9 @@ wget, writeShellApplication, xdotool, - xorg, + xwininfo, + xrandr, + xprop, yad, }: @@ -70,9 +72,9 @@ stdenvNoCC.mkDerivation { util-linux wget xdotool - xorg.xprop - xorg.xrandr - xorg.xwininfo + xprop + xrandr + xwininfo yad ]; name = "stl-head"; diff --git a/pkgs/by-name/st/stepmania/package.nix b/pkgs/by-name/st/stepmania/package.nix index a447ebb62b07..096d4dbb807c 100644 --- a/pkgs/by-name/st/stepmania/package.nix +++ b/pkgs/by-name/st/stepmania/package.nix @@ -16,7 +16,7 @@ libpulseaudio, libvorbis, udev, - xorg, + libxtst, zlib, }: @@ -72,7 +72,7 @@ stdenv.mkDerivation { libpulseaudio libvorbis udev - xorg.libXtst + libxtst zlib ]; diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix index ac6dca9e4e36..4e542ddbdf3b 100644 --- a/pkgs/by-name/st/stm32cubemx/package.nix +++ b/pkgs/by-name/st/stm32cubemx/package.nix @@ -130,13 +130,13 @@ buildFHSEnv { nspr nss pango - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr + libx11 + libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr libgcrypt openssl udev diff --git a/pkgs/by-name/st/stone-phaser/package.nix b/pkgs/by-name/st/stone-phaser/package.nix index 7dbadf290a6c..6abff3937a6f 100644 --- a/pkgs/by-name/st/stone-phaser/package.nix +++ b/pkgs/by-name/st/stone-phaser/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libx11, cairo, libGL, lv2, @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 cairo libGL lv2 diff --git a/pkgs/by-name/st/stumpish/package.nix b/pkgs/by-name/st/stumpish/package.nix index a6ac190c07d1..9e0876bfd404 100644 --- a/pkgs/by-name/st/stumpish/package.nix +++ b/pkgs/by-name/st/stumpish/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, gnused, ncurses, - xorg, + xprop, rlwrap, }: @@ -22,7 +22,7 @@ stdenv.mkDerivation { buildInputs = [ gnused - xorg.xprop + xprop rlwrap ncurses ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation { patches = [ (replaceVars ./paths.patch { sed = "${gnused}/bin/sed"; - xprop = "${xorg.xprop}/bin/xprop"; + xprop = "${xprop}/bin/xprop"; rlwrap = "${rlwrap}/bin/rlwrap"; tput = "${ncurses}/bin/tput"; }) diff --git a/pkgs/by-name/st/styluslabs-write/package.nix b/pkgs/by-name/st/styluslabs-write/package.nix index be176963d0bc..8449e563bd33 100644 --- a/pkgs/by-name/st/styluslabs-write/package.nix +++ b/pkgs/by-name/st/styluslabs-write/package.nix @@ -4,7 +4,9 @@ stdenv, pkg-config, SDL2, - xorg, + libxi, + libxcursor, + libx11, libGL, roboto, imagemagick, @@ -57,9 +59,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 - xorg.libX11 - xorg.libXi - xorg.libXcursor + libx11 + libxi + libxcursor libGL ]; diff --git a/pkgs/by-name/su/sublime/package.nix b/pkgs/by-name/su/sublime/package.nix index 3f8137f7a783..071b89b45353 100644 --- a/pkgs/by-name/su/sublime/package.nix +++ b/pkgs/by-name/su/sublime/package.nix @@ -3,7 +3,7 @@ lib, stdenv, glib, - xorg, + libx11, cairo, gtk2, makeDesktopItem, @@ -11,7 +11,7 @@ let libPath = lib.makeLibraryPath [ glib - xorg.libX11 + libx11 gtk2 cairo ]; diff --git a/pkgs/by-name/su/sumo/package.nix b/pkgs/by-name/su/sumo/package.nix index d52d7ce8e880..f773b03caa54 100644 --- a/pkgs/by-name/su/sumo/package.nix +++ b/pkgs/by-name/su/sumo/package.nix @@ -26,7 +26,12 @@ stdenv, swig, xercesc, - xorg, + libxrender, + libxrandr, + libxft, + libxfixes, + libxext, + libxcursor, zlib, }: @@ -71,12 +76,12 @@ stdenv.mkDerivation rec { zlib python3 libX11 - xorg.libXcursor - xorg.libXext - xorg.libXfixes - xorg.libXft - xorg.libXrandr - xorg.libXrender + libxcursor + libxext + libxfixes + libxft + libxrandr + libxrender ]; meta = { diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix index 71ba7020c52d..732652569acb 100644 --- a/pkgs/by-name/su/sunshine/package.nix +++ b/pkgs/by-name/su/sunshine/package.nix @@ -11,7 +11,12 @@ avahi, libevdev, libpulseaudio, - xorg, + libxtst, + libxrandr, + libxi, + libxfixes, + libxdmcp, + libx11, libxcb, openssl, libopus, @@ -130,12 +135,12 @@ stdenv'.mkDerivation (finalAttrs: { avahi libevdev libpulseaudio - xorg.libX11 + libx11 libxcb - xorg.libXfixes - xorg.libXrandr - xorg.libXtst - xorg.libXi + libxfixes + libxrandr + libxtst + libxi openssl libopus boost @@ -153,7 +158,7 @@ stdenv'.mkDerivation (finalAttrs: { libsepol libthai libdatrie - xorg.libXdmcp + libxdmcp libxkbcommon libepoxy libva @@ -175,7 +180,7 @@ stdenv'.mkDerivation (finalAttrs: { runtimeDependencies = [ avahi libgbm - xorg.libXrandr + libxrandr libxcb libglvnd ]; diff --git a/pkgs/by-name/su/supermodel/package.nix b/pkgs/by-name/su/supermodel/package.nix index f78444742fe2..a28bb4e50d13 100644 --- a/pkgs/by-name/su/supermodel/package.nix +++ b/pkgs/by-name/su/supermodel/package.nix @@ -4,7 +4,7 @@ libGLU, SDL2, SDL2_net, - xorg, + libx11, stdenv, zlib, }: @@ -24,7 +24,7 @@ stdenv.mkDerivation { libGLU SDL2 SDL2_net - xorg.libX11 + libx11 zlib ]; diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 5a5f76a7e5db..454106b06ba2 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -7,7 +7,13 @@ copyDesktopItems, pkg-config, desktopToDarwinBundle, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxext, + libxcursor, + libx11, wayland, wayland-protocols, libxkbcommon, @@ -45,15 +51,15 @@ buildGoModule rec { mpv-unwrapped ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libXxf86vm - xorg.libX11 + libxxf86vm + libx11 ] ++ lib.optionals (stdenv.hostPlatform.isLinux && !waylandSupport) [ - xorg.libXrandr - xorg.libXinerama - xorg.libXcursor - xorg.libXi - xorg.libXext + libxrandr + libxinerama + libxcursor + libxi + libxext ] ++ lib.optionals (stdenv.hostPlatform.isLinux && waylandSupport) [ wayland diff --git a/pkgs/by-name/su/surf-display/package.nix b/pkgs/by-name/su/surf-display/package.nix index 82abc8d1a26e..83aced3a52a7 100644 --- a/pkgs/by-name/su/surf-display/package.nix +++ b/pkgs/by-name/su/surf-display/package.nix @@ -8,7 +8,8 @@ matchbox, xdotool, unclutter, - xorg, + xmodmap, + xkbutils, pulseaudio, xprintidle-ng, }: @@ -32,8 +33,8 @@ stdenv.mkDerivation rec { pulseaudio xprintidle-ng xdotool - xorg.xmodmap - xorg.xkbutils + xmodmap + xkbutils unclutter ]; diff --git a/pkgs/by-name/su/surf/package.nix b/pkgs/by-name/su/surf/package.nix index 471e69f60623..58353944c9d2 100644 --- a/pkgs/by-name/su/surf/package.nix +++ b/pkgs/by-name/su/surf/package.nix @@ -12,7 +12,7 @@ libsoup_2_4, # webkitgtk_4_0, webkitgtk_4_1, - xorg, + xprop, dmenu, findutils, gnused, @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { preFixup = let depsPath = lib.makeBinPath [ - xorg.xprop + xprop dmenu findutils gnused diff --git a/pkgs/by-name/sv/svp/package.nix b/pkgs/by-name/sv/svp/package.nix index d2d30a4d7d03..02ffe3e53ee1 100644 --- a/pkgs/by-name/sv/svp/package.nix +++ b/pkgs/by-name/sv/svp/package.nix @@ -14,7 +14,7 @@ libmediainfo, libusb1, vapoursynth, - xorg, + libx11, systemdLibs, openssl, p7zip, @@ -53,7 +53,7 @@ let libmediainfo libusb1 vapoursynth - xorg.libX11 + libx11 systemdLibs openssl ]; diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix index 630ac7193c03..c24592fecc8f 100644 --- a/pkgs/by-name/sw/sway-unwrapped/package.nix +++ b/pkgs/by-name/sw/sway-unwrapped/package.nix @@ -27,7 +27,7 @@ # Used by the NixOS module: isNixOS ? false, enableXWayland ? true, - xorg, + libxcb-wm, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd, trayEnabled ? systemdSupport, @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { (wlroots_0_19.override { inherit (finalAttrs) enableXWayland; }) ] ++ lib.optionals finalAttrs.enableXWayland [ - xorg.xcbutilwm + libxcb-wm ]; mesonFlags = diff --git a/pkgs/by-name/sw/switchres/package.nix b/pkgs/by-name/sw/switchres/package.nix index ae5937fb3b4d..fa276b63eab2 100644 --- a/pkgs/by-name/sw/switchres/package.nix +++ b/pkgs/by-name/sw/switchres/package.nix @@ -3,7 +3,9 @@ lib, pkg-config, fetchFromGitHub, - xorg, + libxrandr, + libx11, + xorgproto, libdrm, SDL2, }: @@ -24,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libXrandr - xorg.xorgproto + libxrandr + xorgproto libdrm SDL2 ]; @@ -34,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: { runHook prePatch substituteInPlace ./custom_video_xrandr.cpp \ - --replace-fail libX11.so ${xorg.libX11}/lib/libX11.so \ - --replace-fail libXrandr.so ${xorg.libXrandr}/lib/libXrandr.so + --replace-fail libX11.so ${libx11}/lib/libX11.so \ + --replace-fail libXrandr.so ${libxrandr}/lib/libXrandr.so substituteInPlace ./custom_video_drmkms.cpp \ --replace-fail libdrm.so ${libdrm}/lib/libdrm.so \ diff --git a/pkgs/by-name/sx/sx/package.nix b/pkgs/by-name/sx/sx/package.nix index 2ba36a610c82..0d3dbd791f57 100644 --- a/pkgs/by-name/sx/sx/package.nix +++ b/pkgs/by-name/sx/sx/package.nix @@ -5,7 +5,8 @@ makeDesktopItem, patsh, coreutils, - xorg, + xorg-server, + xauth, nixosTests, }: @@ -26,8 +27,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { buildInputs = [ coreutils # needed for cross - xorg.xauth - xorg.xorgserver + xauth + xorg-server ]; postInstall = '' diff --git a/pkgs/by-name/sx/sxcs/package.nix b/pkgs/by-name/sx/sxcs/package.nix index 50a99f5342be..e85531c41077 100644 --- a/pkgs/by-name/sx/sxcs/package.nix +++ b/pkgs/by-name/sx/sxcs/package.nix @@ -2,7 +2,8 @@ lib, stdenv, fetchFromGitea, - xorg, + libxcursor, + libx11, installShellFiles, }: @@ -19,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ - xorg.libX11 - xorg.libXcursor + libx11 + libxcursor ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sy/sylk/package.nix b/pkgs/by-name/sy/sylk/package.nix index 2ff7d56aefc2..f96678b48724 100644 --- a/pkgs/by-name/sy/sylk/package.nix +++ b/pkgs/by-name/sy/sylk/package.nix @@ -2,7 +2,7 @@ appimageTools, fetchurl, lib, - xorg, + libxshmfence, }: appimageTools.wrapType2 rec { @@ -15,7 +15,7 @@ appimageTools.wrapType2 rec { }; extraPkgs = pkgs: [ - xorg.libxshmfence + libxshmfence ]; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/sy/systeroid/package.nix b/pkgs/by-name/sy/systeroid/package.nix index 6a934a616e64..7c80808ac652 100644 --- a/pkgs/by-name/sy/systeroid/package.nix +++ b/pkgs/by-name/sy/systeroid/package.nix @@ -3,7 +3,7 @@ rustPlatform, fetchFromGitHub, linux-doc, - xorg, + libxcb, }: rustPlatform.buildRustPackage rec { @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Gce7DqhGD0CeBTPEqKhzdQ3IIHA6kjoWrejj4V8gT1I="; buildInputs = [ - xorg.libxcb + libxcb ]; # tries to access /sys/ diff --git a/pkgs/by-name/ta/tableplus/linux.nix b/pkgs/by-name/ta/tableplus/linux.nix index 7d5e1f3fdaee..7835f46faabd 100644 --- a/pkgs/by-name/ta/tableplus/linux.nix +++ b/pkgs/by-name/ta/tableplus/linux.nix @@ -11,7 +11,13 @@ libxkbcommon, stdenv, wrapGAppsHook3, - xorg, + libxrender, + libxrandr, + libxi, + libxext, + libxcursor, + libx11, + libxcb, }: stdenv.mkDerivation (finalAttrs: { @@ -36,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { libgee libsecret libxkbcommon - xorg.libX11 - xorg.libXcursor - xorg.libXext - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libxcb + libx11 + libxcursor + libxext + libxi + libxrandr + libxrender + libxcb ]; unpackPhase = '' diff --git a/pkgs/by-name/ta/tacentview/package.nix b/pkgs/by-name/ta/tacentview/package.nix index 2901b81e21f3..7a6dace1725f 100644 --- a/pkgs/by-name/ta/tacentview/package.nix +++ b/pkgs/by-name/ta/tacentview/package.nix @@ -8,7 +8,8 @@ ninja, stdenv, tacent, - xorg, + libx11, + libxcb, zenity, }: @@ -33,8 +34,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ stdenv.cc.cc.lib tacent - xorg.libX11 - xorg.libxcb + libx11 + libxcb zenity ]; diff --git a/pkgs/by-name/ta/tamsyn/package.nix b/pkgs/by-name/ta/tamsyn/package.nix index a8019b47d0de..a857176ee1a8 100644 --- a/pkgs/by-name/ta/tamsyn/package.nix +++ b/pkgs/by-name/ta/tamsyn/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, fontforge, - xorg, + mkfontscale, }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ fontforge - xorg.mkfontscale + mkfontscale ]; unpackPhase = '' diff --git a/pkgs/by-name/ta/tamzen/package.nix b/pkgs/by-name/ta/tamzen/package.nix index dbec84fbc981..260e180a2a1c 100644 --- a/pkgs/by-name/ta/tamzen/package.nix +++ b/pkgs/by-name/ta/tamzen/package.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, - xorg, + mkfontscale, lib, stdenv, }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-W5Wqsm5rpzzcbJl2lv6ORAznaAwLcmJ2S6Qo2zIoq9I="; }; - nativeBuildInputs = [ xorg.mkfontscale ]; + nativeBuildInputs = [ mkfontscale ]; installPhase = '' install -m 644 -D otb/*.otb pcf/*.pcf -t "$out/share/fonts/misc" diff --git a/pkgs/by-name/ta/tau-hydrogen/package.nix b/pkgs/by-name/ta/tau-hydrogen/package.nix index dcbb912ca118..e4fbc333a48e 100644 --- a/pkgs/by-name/ta/tau-hydrogen/package.nix +++ b/pkgs/by-name/ta/tau-hydrogen/package.nix @@ -5,7 +5,7 @@ meson, ninja, librsvg, - xorg, + xcursorgen, }: stdenv.mkDerivation (finalAttrs: { @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja librsvg - xorg.xcursorgen + xcursorgen ]; meta = { diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix index 7a3a4902d640..63b3d9eee392 100644 --- a/pkgs/by-name/ta/tauon/package.nix +++ b/pkgs/by-name/ta/tauon/package.nix @@ -17,7 +17,7 @@ librsvg, libsamplerate, libvorbis, - xorg, + libxcursor, mpg123, opusfile, pango, @@ -139,7 +139,7 @@ python3Packages.buildPythonApplication rec { libopenmpt pulseaudio ] - ++ lib.optional stdenv.hostPlatform.isLinux xorg.libXcursor + ++ lib.optional stdenv.hostPlatform.isLinux libxcursor ) }" "--prefix PYTHONPATH : $out/share/tauon" diff --git a/pkgs/by-name/te/teamspeak6-client/package.nix b/pkgs/by-name/te/teamspeak6-client/package.nix index 20b054a85dd1..62f2db8b663e 100644 --- a/pkgs/by-name/te/teamspeak6-client/package.nix +++ b/pkgs/by-name/te/teamspeak6-client/package.nix @@ -26,7 +26,12 @@ pipewire, udev, libGL, - xorg, + libxtst, + libxscrnsaver, + libxfixes, + libxdamage, + libx11, + libxshmfence, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -59,12 +64,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { libvdpau nss pipewire - xorg.libX11 - xorg.libXScrnSaver - xorg.libXdamage - xorg.libXfixes - xorg.libxshmfence - xorg.libXtst + libx11 + libxscrnsaver + libxdamage + libxfixes + libxshmfence + libxtst ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/ted/package.nix b/pkgs/by-name/te/ted/package.nix index eaa5c5a373d8..e0993a11282e 100644 --- a/pkgs/by-name/te/ted/package.nix +++ b/pkgs/by-name/te/ted/package.nix @@ -5,7 +5,10 @@ pkg-config, zlib, pcre, - xorg, + libxpm, + libx11, + libsm, + libice, libjpeg, libtiff, libpng, @@ -87,10 +90,10 @@ stdenv.mkDerivation rec { buildInputs = [ zlib pcre - xorg.libX11 - xorg.libICE - xorg.libSM - xorg.libXpm + libx11 + libice + libsm + libxpm libjpeg libtiff libpng diff --git a/pkgs/by-name/te/terminus_font/package.nix b/pkgs/by-name/te/terminus_font/package.nix index 8aa2810fb211..92075da3104c 100644 --- a/pkgs/by-name/te/terminus_font/package.nix +++ b/pkgs/by-name/te/terminus_font/package.nix @@ -4,7 +4,7 @@ fetchurl, python3, bdftopcf, - xorg, + mkfontscale, }: stdenv.mkDerivation (finalAttrs: { @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ python3 bdftopcf - xorg.mkfontscale + mkfontscale ]; strictDeps = true; diff --git a/pkgs/by-name/te/tetraproc/package.nix b/pkgs/by-name/te/tetraproc/package.nix index c1462b81e838..5c2e7b266414 100644 --- a/pkgs/by-name/te/tetraproc/package.nix +++ b/pkgs/by-name/te/tetraproc/package.nix @@ -13,7 +13,11 @@ libclxclient, libsndfile, libxcb, - xorg, + libxrender, + libxft, + libxdmcp, + libxau, + libx11, }: stdenv.mkDerivation rec { @@ -37,11 +41,11 @@ stdenv.mkDerivation rec { libsndfile freetype libxcb - xorg.libX11 - xorg.libXau - xorg.libXdmcp - xorg.libXft - xorg.libXrender + libx11 + libxau + libxdmcp + libxft + libxrender ]; makeFlags = [ diff --git a/pkgs/by-name/te/tetrd/package.nix b/pkgs/by-name/te/tetrd/package.nix index e7694d7ec5f4..ee7b6897f1b9 100644 --- a/pkgs/by-name/te/tetrd/package.nix +++ b/pkgs/by-name/te/tetrd/package.nix @@ -9,7 +9,9 @@ libevent, libvpx, libxslt, - xorg, + libxtst, + libxscrnsaver, + libxdamage, minizip, nss, re2, @@ -45,9 +47,9 @@ stdenv.mkDerivation rec { libevent libvpx libxslt - xorg.libXScrnSaver - xorg.libXdamage - xorg.libXtst + libxscrnsaver + libxdamage + libxtst minizip nss re2 diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix index eff9b716e5c4..e0b9aa71b427 100644 --- a/pkgs/by-name/te/tev/package.nix +++ b/pkgs/by-name/te/tev/package.nix @@ -15,7 +15,11 @@ wayland, wayland-protocols, wayland-scanner, - xorg, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, }: stdenv.mkDerivation rec { @@ -61,11 +65,11 @@ stdenv.mkDerivation rec { wayland wayland-protocols wayland-scanner - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXrandr + libx11 + libxcursor + libxi + libxinerama + libxrandr ]; cmakeFlags = [ diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix index 065b7f86b595..1d5eaa922dfc 100644 --- a/pkgs/by-name/ti/tigervnc/package.nix +++ b/pkgs/by-name/ti/tigervnc/package.nix @@ -2,7 +2,26 @@ lib, stdenv, fetchFromGitHub, - xorg, + xorg-server, + util-macros, + tab-window-manager, + libxtst, + libxrandr, + libxi, + libxft, + libxfont_2, + libxext, + libxdamage, + libx11, + libsm, + libice, + font-util, + xsetroot, + xorgproto, + xkbcomp, + xauth, + libxkbfile, + libpciaccess, xkeyboard_config, zlib, libjpeg_turbo, @@ -68,10 +87,10 @@ stdenv.mkDerivation (finalAttrs: { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast" export CXXFLAGS="$CXXFLAGS -fpermissive" # Build Xvnc - tar xf ${xorg.xorgserver.src} + tar xf ${xorg-server.src} cp -R xorg*/* unix/xserver pushd unix/xserver - version=$(echo ${xorg.xorgserver.name} | sed 's/.*-\([0-9]\+\).[0-9]\+.*/\1/g') + version=$(echo ${xorg-server.name} | sed 's/.*-\([0-9]\+\).[0-9]\+.*/\1/g') patch -p1 < "$source_top/unix/xserver$version.patch" autoreconf -vfi ./configure $configureFlags --disable-devel-docs --disable-docs \ @@ -87,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { --enable-install-libxf86config \ --prefix="$out" --disable-unit-tests \ --with-xkb-path=${xkeyboard_config}/share/X11/xkb \ - --with-xkb-bin-directory=${xorg.xkbcomp}/bin \ + --with-xkb-bin-directory=${xkbcomp}/bin \ --with-xkb-output=$out/share/X11/xkb/compiled make TIGERVNC_SRC=$src TIGERVNC_BUILDDIR=`pwd`/../.. -j$NIX_BUILD_CORES popd @@ -107,9 +126,9 @@ stdenv.mkDerivation (finalAttrs: { --prefix PATH : ${ lib.makeBinPath [ xterm - xorg.twm - xorg.xsetroot - xorg.xauth + tab-window-manager + xsetroot + xauth ] } '' @@ -135,24 +154,24 @@ stdenv.mkDerivation (finalAttrs: { nettle pam perl - xorg.xorgproto - xorg.utilmacros - xorg.libXtst - xorg.libXext - xorg.libX11 - xorg.libXext - xorg.libICE - xorg.libXi - xorg.libSM - xorg.libXft - xorg.libxkbfile - xorg.libXfont2 - xorg.libpciaccess + xorgproto + util-macros + libxtst + libxext + libx11 + libxext + libice + libxi + libsm + libxft + libxkbfile + libxfont_2 + libpciaccess libGLU - xorg.libXrandr - xorg.libXdamage + libxrandr + libxdamage ] - ++ xorg.xorgserver.buildInputs + ++ xorg-server.buildInputs ); nativeBuildInputs = [ @@ -163,16 +182,16 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux ( [ - xorg.fontutil + font-util libtool makeWrapper - xorg.utilmacros + util-macros zlib ] - ++ xorg.xorgserver.nativeBuildInputs + ++ xorg-server.nativeBuildInputs ); - propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux xorg.xorgserver.propagatedBuildInputs; + propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux xorg-server.propagatedBuildInputs; passthru.tests.tigervnc = nixosTests.tigervnc; diff --git a/pkgs/by-name/to/tomboy-ng/package.nix b/pkgs/by-name/to/tomboy-ng/package.nix index dea1e31daba6..9a061507e249 100644 --- a/pkgs/by-name/to/tomboy-ng/package.nix +++ b/pkgs/by-name/to/tomboy-ng/package.nix @@ -12,7 +12,7 @@ gtk2, gdk-pixbuf, at-spi2-atk, - xorg, + libx11, libnotify, nix-update-script, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { gtk2 gdk-pixbuf at-spi2-atk - xorg.libX11 + libx11 libnotify ]; diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix index 45f99736fe84..4007e2c0b2bd 100644 --- a/pkgs/by-name/to/tome4/package.nix +++ b/pkgs/by-name/to/tome4/package.nix @@ -14,7 +14,8 @@ SDL2, SDL2_image, SDL2_ttf, - xorg, + libx11, + xorgproto, nix-update-script, }: @@ -73,8 +74,8 @@ stdenv.mkDerivation (finalAttrs: { openal libpng libvorbis - xorg.libX11 - xorg.xorgproto + libx11 + xorgproto ] ++ sdlInputs; diff --git a/pkgs/by-name/to/touchegg/package.nix b/pkgs/by-name/to/touchegg/package.nix index ddb82d4895c0..ca98e4c126bc 100644 --- a/pkgs/by-name/to/touchegg/package.nix +++ b/pkgs/by-name/to/touchegg/package.nix @@ -8,7 +8,13 @@ libinput, pugixml, cairo, - xorg, + libxtst, + libxrandr, + libxi, + libxdmcp, + libx11, + libpthread-stubs, + libxcb, gtk3-x11, pkg-config, cmake, @@ -60,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: { pugixml cairo gtk3-x11 - xorg.libX11 - xorg.libXtst - xorg.libXrandr - xorg.libXi - xorg.libXdmcp - xorg.libpthreadstubs - xorg.libxcb + libx11 + libxtst + libxrandr + libxi + libxdmcp + libpthread-stubs + libxcb ]; env.PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; diff --git a/pkgs/by-name/tr/tradingview/package.nix b/pkgs/by-name/tr/tradingview/package.nix index a19ed8864e20..1963260b1c63 100644 --- a/pkgs/by-name/tr/tradingview/package.nix +++ b/pkgs/by-name/tr/tradingview/package.nix @@ -19,7 +19,9 @@ sqlite, systemd, wayland, - xorg, + libxext, + libx11, + libxcb, }: stdenv.mkDerivation (finalAttrs: { @@ -54,9 +56,9 @@ stdenv.mkDerivation (finalAttrs: { sqlite systemd wayland - xorg.libxcb - xorg.libX11 - xorg.libXext + libxcb + libx11 + libxext ]; unpackPhase = '' diff --git a/pkgs/by-name/tr/transito/package.nix b/pkgs/by-name/tr/transito/package.nix index f9f6842447fe..cb00fb1f4e25 100644 --- a/pkgs/by-name/tr/transito/package.nix +++ b/pkgs/by-name/tr/transito/package.nix @@ -7,7 +7,10 @@ vulkan-headers, libxkbcommon, wayland, - xorg, + libxfixes, + libxcursor, + libx11, + libxcb, libGL, sqlite, }: @@ -29,10 +32,10 @@ buildGoModule rec { vulkan-headers libxkbcommon wayland - xorg.libX11 - xorg.libXcursor - xorg.libXfixes - xorg.libxcb + libx11 + libxcursor + libxfixes + libxcb libGL sqlite ]; diff --git a/pkgs/by-name/tr/trillian-im/package.nix b/pkgs/by-name/tr/trillian-im/package.nix index cdb45ac0fd0d..c86079475646 100644 --- a/pkgs/by-name/tr/trillian-im/package.nix +++ b/pkgs/by-name/tr/trillian-im/package.nix @@ -12,7 +12,7 @@ libnotify, libsecret, pangomm, - xorg, + libxscrnsaver, libpulseaudio, librsvg, libzip, @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libnotify libsecret pangomm - xorg.libXScrnSaver + libxscrnsaver libpulseaudio librsvg libzip diff --git a/pkgs/by-name/tt/ttygif/package.nix b/pkgs/by-name/tt/ttygif/package.nix index 81b76298d728..93ec84f151f4 100644 --- a/pkgs/by-name/tt/ttygif/package.nix +++ b/pkgs/by-name/tt/ttygif/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, makeWrapper, imagemagick, - xorg, + xwd, }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${ lib.makeBinPath [ imagemagick - xorg.xwd + xwd ] } ''; diff --git a/pkgs/by-name/tv/tvbrowser/test.nix b/pkgs/by-name/tv/tvbrowser/test.nix index d7dc2033f6c5..9948e6c86fac 100644 --- a/pkgs/by-name/tv/tvbrowser/test.nix +++ b/pkgs/by-name/tv/tvbrowser/test.nix @@ -4,14 +4,14 @@ tvbrowser, runCommand, writeShellApplication, - xorg, + xwininfo, }: let testScript = writeShellApplication { name = "tvbrowser-test-script"; runtimeInputs = [ - xorg.xwininfo + xwininfo tvbrowser ]; text = '' diff --git a/pkgs/by-name/ty/typora/package.nix b/pkgs/by-name/ty/typora/package.nix index 06e15d9996d7..9fc4f0484ce2 100644 --- a/pkgs/by-name/ty/typora/package.nix +++ b/pkgs/by-name/ty/typora/package.nix @@ -86,14 +86,14 @@ let libGL expat libxkbcommon - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libxcb + libx11 + libxcursor + libxrandr + libxcomposite + libxdamage + libxext + libxfixes + libxcb ]); runScript = '' Typora "$@" diff --git a/pkgs/by-name/uc/ucs-fonts/package.nix b/pkgs/by-name/uc/ucs-fonts/package.nix index f1908ed4c39c..5ea323440107 100644 --- a/pkgs/by-name/uc/ucs-fonts/package.nix +++ b/pkgs/by-name/uc/ucs-fonts/package.nix @@ -4,7 +4,8 @@ fetchurl, bdftopcf, libfaketime, - xorg, + mkfontscale, + fonttosfnt, }: stdenv.mkDerivation { @@ -31,8 +32,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ bdftopcf libfaketime - xorg.fonttosfnt - xorg.mkfontscale + fonttosfnt + mkfontscale ]; buildPhase = '' diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix index 231e2dc9cec3..e1d2843c3f93 100644 --- a/pkgs/by-name/ue/ueberzugpp/package.nix +++ b/pkgs/by-name/ue/ueberzugpp/package.nix @@ -28,7 +28,8 @@ wayland-protocols, wayland-scanner, enableX11 ? stdenv.hostPlatform.isLinux, - xorg, + libxcb-image, + libx11, cudaSupport ? config.cudaSupport, cudaPackages, }: @@ -84,8 +85,8 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols ] ++ lib.optionals enableX11 [ - xorg.libX11 - xorg.xcbutilimage + libx11 + libxcb-image ] # Required by opencv when cudaSupport is enabled ++ lib.optionals cudaSupport [ diff --git a/pkgs/by-name/uh/uhhyou-plugins/package.nix b/pkgs/by-name/uh/uhhyou-plugins/package.nix index 392b83f2aaf2..f24ffa197b58 100644 --- a/pkgs/by-name/uh/uhhyou-plugins/package.nix +++ b/pkgs/by-name/uh/uhhyou-plugins/package.nix @@ -10,7 +10,7 @@ freetype, libxcb, xcbutil, - xorg, + libxcb-cursor, xcbutilkeysyms, libxkbcommon, libX11, @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { freetype libxcb xcbutil - xorg.xcbutilcursor + libxcb-cursor xcbutilkeysyms libxkbcommon libX11 diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index c68cc0dd19b2..1f9730cc737f 100644 --- a/pkgs/by-name/ui/uiua/package.nix +++ b/pkgs/by-name/ui/uiua/package.nix @@ -15,7 +15,10 @@ libGL, libxkbcommon, wayland, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, windowSupport ? false, runCommand, @@ -62,10 +65,10 @@ rustPlatform.buildRustPackage (finalAttrs: { libGL libxkbcommon wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ]; in lib.optionalString (runtimeDependencies != [ ] && stdenv.hostPlatform.isLinux) '' diff --git a/pkgs/by-name/un/uni-vga/package.nix b/pkgs/by-name/un/uni-vga/package.nix index 021ed73ccc3a..a2b8a12da10f 100644 --- a/pkgs/by-name/un/uni-vga/package.nix +++ b/pkgs/by-name/un/uni-vga/package.nix @@ -6,7 +6,8 @@ kbd, bdftopcf, libfaketime, - xorg, + mkfontscale, + fonttosfnt, }: stdenv.mkDerivation { @@ -20,8 +21,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ bdftopcf libfaketime - xorg.fonttosfnt - xorg.mkfontscale + fonttosfnt + mkfontscale ] ++ lib.optionals stdenv.hostPlatform.isLinux [ perl diff --git a/pkgs/by-name/un/unicon-lang/package.nix b/pkgs/by-name/un/unicon-lang/package.nix index a689939af577..acfa781ad979 100644 --- a/pkgs/by-name/un/unicon-lang/package.nix +++ b/pkgs/by-name/un/unicon-lang/package.nix @@ -6,7 +6,7 @@ fetchFromGitHub, coreutils, libpng, - xorg, + libxft, freetype, zlib, libjpeg, @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { libX11 libjpeg libpng - xorg.libXft + libxft freetype # ssl openssl diff --git a/pkgs/by-name/un/unifont/package.nix b/pkgs/by-name/un/unifont/package.nix index c8d96f349836..910d12abca5a 100644 --- a/pkgs/by-name/un/unifont/package.nix +++ b/pkgs/by-name/un/unifont/package.nix @@ -2,7 +2,8 @@ lib, stdenv, fetchurl, - xorg, + mkfontscale, + fonttosfnt, libfaketime, }: @@ -27,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ libfaketime - xorg.fonttosfnt - xorg.mkfontscale + fonttosfnt + mkfontscale ]; dontUnpack = true; diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix index 8fac9d1b9186..1836ab96b8af 100644 --- a/pkgs/by-name/un/unityhub/package.nix +++ b/pkgs/by-name/un/unityhub/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { with pkgs; [ # Unity Hub binary dependencies - xorg.libXrandr + libxrandr xdg-utils # GTK filepicker @@ -67,14 +67,14 @@ stdenv.mkDerivation rec { dbus at-spi2-core pango - xorg.libXcomposite - xorg.libXext - xorg.libXdamage - xorg.libXfixes - xorg.libxcb - xorg.libxshmfence - xorg.libXScrnSaver - xorg.libXtst + libxcomposite + libxext + libxdamage + libxfixes + libxcb + libxshmfence + libxscrnsaver + libxtst # Unity Hub additional dependencies libva @@ -92,8 +92,8 @@ stdenv.mkDerivation rec { # Unity Editor dependencies libglvnd # provides ligbl - xorg.libX11 - xorg.libXcursor + libx11 + libxcursor glib gdk-pixbuf libxml2_13 @@ -106,8 +106,8 @@ stdenv.mkDerivation rec { vulkan-loader # Unity Bug Reporter specific dependencies - xorg.libICE - xorg.libSM + libice + libsm # Fonts used by built-in and third party editor tools corefonts diff --git a/pkgs/by-name/un/universal-android-debloater/package.nix b/pkgs/by-name/un/universal-android-debloater/package.nix index f2f7f3a7cb1d..98d89876bd7c 100644 --- a/pkgs/by-name/un/universal-android-debloater/package.nix +++ b/pkgs/by-name/un/universal-android-debloater/package.nix @@ -15,7 +15,10 @@ rustPlatform, wayland, writableTmpDirAsHomeHook, - xorg, + libxrandr, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -56,10 +59,10 @@ rustPlatform.buildRustPackage (finalAttrs: { libglvnd libxkbcommon wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - xorg.libXrandr + libx11 + libxcursor + libxi + libxrandr ] } --suffix PATH : ${lib.makeBinPath [ android-tools ]} ''; diff --git a/pkgs/by-name/un/unixbench/package.nix b/pkgs/by-name/un/unixbench/package.nix index e625fc800cea..7ce16c0d8a2a 100644 --- a/pkgs/by-name/un/unixbench/package.nix +++ b/pkgs/by-name/un/unixbench/package.nix @@ -6,7 +6,9 @@ pandoc, installShellFiles, perl, - xorg, + libxext, + libx11, + x11perf, libGLX, coreutils, unixtools, @@ -52,8 +54,8 @@ stdenv.mkDerivation rec { perl ] ++ lib.optionals withGL [ - xorg.libX11 - xorg.libXext + libx11 + libxext libGLX ]; @@ -66,7 +68,7 @@ stdenv.mkDerivation rec { gawk ] ++ lib.optionals withX11perf [ - xorg.x11perf + x11perf ]; makeFlags = [ diff --git a/pkgs/by-name/ur/urdf-viz/package.nix b/pkgs/by-name/ur/urdf-viz/package.nix index 39feb4ca582e..1f1eee83da39 100644 --- a/pkgs/by-name/ur/urdf-viz/package.nix +++ b/pkgs/by-name/ur/urdf-viz/package.nix @@ -4,7 +4,11 @@ rustPlatform, stdenv, libGL, - xorg, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, lib, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -39,21 +43,21 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ stdenv.cc.cc.lib libGL - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXinerama - xorg.libXi + libx11 + libxcursor + libxrandr + libxinerama + libxi ]; # Tell autopatchelf about the dependency that is linked through dlopen runtimeDependencies = [ libGL - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXinerama - xorg.libXi + libx11 + libxcursor + libxrandr + libxinerama + libxi ]; meta = { diff --git a/pkgs/by-name/uw/uw-ttyp0/package.nix b/pkgs/by-name/uw/uw-ttyp0/package.nix index 18405b0b978e..1822608048a9 100644 --- a/pkgs/by-name/uw/uw-ttyp0/package.nix +++ b/pkgs/by-name/uw/uw-ttyp0/package.nix @@ -5,7 +5,8 @@ perl, bdftopcf, bdf2psf, - xorg, + mkfontscale, + fonttosfnt, targetsDat ? null, variantsDat ? null, }: @@ -23,8 +24,8 @@ stdenv.mkDerivation rec { perl bdftopcf bdf2psf - xorg.fonttosfnt - xorg.mkfontdir + fonttosfnt + mkfontscale ]; # configure sizes, encodings and variants diff --git a/pkgs/by-name/ux/uxn11/package.nix b/pkgs/by-name/ux/uxn11/package.nix index 535bc15e21b7..4d0cfe99e821 100644 --- a/pkgs/by-name/ux/uxn11/package.nix +++ b/pkgs/by-name/ux/uxn11/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromSourcehut, - xorg, + libx11, }: stdenv.mkDerivation { @@ -17,7 +17,7 @@ stdenv.mkDerivation { }; buildInputs = [ - xorg.libX11 + libx11 ]; makeFlags = [ "PREFIX=$(out)" ]; @@ -32,6 +32,6 @@ stdenv.mkDerivation { license = lib.licenses.mit; mainProgram = "uxn11"; maintainers = with lib.maintainers; [ jleightcap ]; - inherit (xorg.libX11.meta) platforms; + inherit (libx11.meta) platforms; }; } diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index 277f172ef786..556e9fe5f4c3 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -14,7 +14,13 @@ lttng-ust_2_12, krb5, bash, - xorg, + libxrandr, + libxi, + libxext, + libxcursor, + libx11, + libsm, + libice, nix-update-script, }: @@ -73,13 +79,13 @@ buildDotnetModule (finalAttrs: { ]; runtimeDeps = [ - xorg.libX11 - xorg.libXrandr - xorg.libXi - xorg.libICE - xorg.libSM - xorg.libXcursor - xorg.libXext + libx11 + libxrandr + libxi + libice + libsm + libxcursor + libxext ]; desktopItems = [ diff --git a/pkgs/by-name/va/vanilla-dmz/package.nix b/pkgs/by-name/va/vanilla-dmz/package.nix index eb728e3877df..e7097a329208 100644 --- a/pkgs/by-name/va/vanilla-dmz/package.nix +++ b/pkgs/by-name/va/vanilla-dmz/package.nix @@ -2,7 +2,7 @@ stdenvNoCC, lib, fetchzip, - xorg, + xcursorgen, hicolor-icon-theme, }: @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec { }; buildInputs = [ - xorg.xcursorgen + xcursorgen ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/ve/vesta-viewer/package.nix b/pkgs/by-name/ve/vesta-viewer/package.nix index a4cb6af59f16..ebf984923f23 100644 --- a/pkgs/by-name/ve/vesta-viewer/package.nix +++ b/pkgs/by-name/ve/vesta-viewer/package.nix @@ -14,7 +14,8 @@ libgcc, gtk3, gtk2, - xorg, + libxxf86vm, + libxtst, temurin-jre-bin, }: @@ -48,8 +49,8 @@ let gtk3 gtk2 temurin-jre-bin - xorg.libXxf86vm - xorg.libXtst + libxxf86vm + libxtst ]; src = fetchzip { diff --git a/pkgs/by-name/vi/viber/package.nix b/pkgs/by-name/vi/viber/package.nix index fb2461304b5a..a54b302a4d62 100644 --- a/pkgs/by-name/vi/viber/package.nix +++ b/pkgs/by-name/vi/viber/package.nix @@ -55,7 +55,25 @@ twolame, wavpack, wayland, - xorg, + xkeyboard-config, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libsm, + libice, + libxcb, xvidcore, zlib, zstd, @@ -133,24 +151,24 @@ stdenv.mkDerivation (finalAttrs: { twolame wavpack wayland - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst - xorg.libxcb - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm + libice + libsm + libx11 + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxscrnsaver + libxtst + libxcb + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-wm xvidcore zlib zstd @@ -172,8 +190,8 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper $out/opt/viber/Viber $out/bin/viber \ --set QT_QPA_PLATFORM "xcb" \ --set QT_PLUGIN_PATH "$out/opt/viber/plugins" \ - --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ - --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb" \ + --set QTCOMPOSE "${libx11.out}/share/X11/locale" \ --set QML2_IMPORT_PATH "$out/opt/viber/qml" mv $out/usr/share $out/share diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index dcf83259e794..fd811f550877 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -18,7 +18,9 @@ vulkan-loader, wayland, winetricks, - xorg, + libxfixes, + libxcursor, + libx11, symlinkJoin, nix-update-script, }: @@ -158,9 +160,9 @@ buildGoModule (finalAttrs: { wayland wine winetricks - xorg.libX11 - xorg.libXcursor - xorg.libXfixes + libx11 + libxcursor + libxfixes ]; postPatch = '' diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix index fc7026083f22..7f3b01b350db 100644 --- a/pkgs/by-name/vi/vintagestory/package.nix +++ b/pkgs/by-name/vi/vintagestory/package.nix @@ -17,7 +17,9 @@ libpulseaudio, dotnet-runtime_8, x11Support ? true, - xorg ? null, + libxi, + libxcursor, + libx11, waylandSupport ? false, wayland ? null, libxkbcommon ? null, @@ -55,9 +57,9 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio ] ++ lib.optionals x11Support [ - xorg.libX11 - xorg.libXi - xorg.libXcursor + libx11 + libxi + libxcursor ] ++ lib.optionals waylandSupport [ wayland diff --git a/pkgs/by-name/vi/visp/package.nix b/pkgs/by-name/vi/visp/package.nix index 5dbf50e4e4a1..6cec848b1bc8 100644 --- a/pkgs/by-name/vi/visp/package.nix +++ b/pkgs/by-name/vi/visp/package.nix @@ -24,7 +24,7 @@ stdenv, texliveSmall, v4l-utils, - xorg, + libpthread-stubs, zbar, zlib, }: @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { openblas opencv python3Packages.numpy - xorg.libpthreadstubs + libpthread-stubs zbar zlib ] diff --git a/pkgs/by-name/vi/vital/package.nix b/pkgs/by-name/vi/vital/package.nix index 1b271c81ad39..1d131fb5104b 100644 --- a/pkgs/by-name/vi/vital/package.nix +++ b/pkgs/by-name/vi/vital/package.nix @@ -8,7 +8,9 @@ alsa-lib, libjack2, curl, - xorg, + libx11, + libsm, + libice, libGL, freetype, zenity, @@ -56,9 +58,9 @@ stdenv.mkDerivation (finalAttrs: { alsa-lib (lib.getLib stdenv.cc.cc) libGL - xorg.libSM - xorg.libICE - xorg.libX11 + libsm + libice + libx11 freetype libjack2 ]; diff --git a/pkgs/by-name/vk/vk-messenger/package.nix b/pkgs/by-name/vk/vk-messenger/package.nix index 400451755024..7dfd160d7656 100644 --- a/pkgs/by-name/vk/vk-messenger/package.nix +++ b/pkgs/by-name/vk/vk-messenger/package.nix @@ -5,7 +5,10 @@ rpmextract, undmg, autoPatchelfHook, - xorg, + libxtst, + libxscrnsaver, + libxdamage, + libxkbfile, gtk3, nss, alsa-lib, @@ -62,10 +65,10 @@ let wrapGAppsHook3 ]; buildInputs = [ - xorg.libXdamage - xorg.libXtst - xorg.libXScrnSaver - xorg.libxkbfile + libxdamage + libxtst + libxscrnsaver + libxkbfile gtk3 nss alsa-lib diff --git a/pkgs/by-name/vl/vlang/package.nix b/pkgs/by-name/vl/vlang/package.nix index 58580035c7ac..ef330235d743 100644 --- a/pkgs/by-name/vl/vlang/package.nix +++ b/pkgs/by-name/vl/vlang/package.nix @@ -8,7 +8,10 @@ makeWrapper, upx, boehmgc, - xorg, + libxdmcp, + libxau, + libx11, + xorgproto, binaryen, }: @@ -76,10 +79,10 @@ stdenv.mkDerivation { binaryen ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libX11 - xorg.libXau - xorg.libXdmcp - xorg.xorgproto + libx11 + libxau + libxdmcp + xorgproto ]; makeFlags = [ diff --git a/pkgs/by-name/vm/vmware-workstation/package.nix b/pkgs/by-name/vm/vmware-workstation/package.nix index d21eb8b0f67e..d4dab6885e6b 100644 --- a/pkgs/by-name/vm/vmware-workstation/package.nix +++ b/pkgs/by-name/vm/vmware-workstation/package.nix @@ -19,7 +19,21 @@ libxcrypt-legacy, libGL, numactl, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxinerama, + libxft, + libxfixes, + libxext, + libxdmcp, + libxdamage, + libxcursor, + libxcomposite, + libxau, + libx11, kmod, python3, autoPatchelfHook, @@ -106,21 +120,21 @@ stdenv.mkDerivation (finalAttrs: { libxcrypt-legacy libGL numactl - xorg.libX11 - xorg.libXau - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXdmcp - xorg.libXext - xorg.libXfixes - xorg.libXft - xorg.libXinerama - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst + libx11 + libxau + libxcomposite + libxcursor + libxdamage + libxdmcp + libxext + libxfixes + libxft + libxinerama + libxi + libxrandr + libxrender + libxscrnsaver + libxtst ]; installPhase = '' @@ -229,8 +243,8 @@ stdenv.mkDerivation (finalAttrs: { --add-needed ${libpulseaudio}/lib/libpulse.so.0 \ --add-needed ${libGL}/lib/libEGL.so.1 \ --add-needed ${numactl}/lib/libnuma.so.1 \ - --add-needed ${xorg.libX11}/lib/libX11.so.6 \ - --add-needed ${xorg.libXi}/lib/libXi.so.6 \ + --add-needed ${libx11}/lib/libX11.so.6 \ + --add-needed ${libxi}/lib/libXi.so.6 \ --add-needed ${libGL}/lib/libGL.so.1 \ $out/lib/vmware/bin/$binary done diff --git a/pkgs/by-name/vo/volctl/package.nix b/pkgs/by-name/vo/volctl/package.nix index cb0bc1c98c37..84cf73f9473a 100644 --- a/pkgs/by-name/vo/volctl/package.nix +++ b/pkgs/by-name/vo/volctl/package.nix @@ -8,7 +8,7 @@ glib, gtk3, pango, - xorg, + libxfixes, }: python3Packages.buildPythonApplication rec { @@ -25,8 +25,8 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace volctl/xwrappers.py \ - --replace 'libXfixes.so' "${xorg.libXfixes}/lib/libXfixes.so" \ - --replace 'libXfixes.so.3' "${xorg.libXfixes}/lib/libXfixes.so.3" + --replace 'libXfixes.so' "${libxfixes}/lib/libXfixes.so" \ + --replace 'libXfixes.so.3' "${libxfixes}/lib/libXfixes.so.3" ''; preBuild = '' diff --git a/pkgs/by-name/vo/voxinput/package.nix b/pkgs/by-name/vo/voxinput/package.nix index 59fa986aad54..02f324c509fe 100644 --- a/pkgs/by-name/vo/voxinput/package.nix +++ b/pkgs/by-name/vo/voxinput/package.nix @@ -6,7 +6,12 @@ libpulseaudio, dotool, libGL, - xorg, + libxxf86vm, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, libxkbcommon, wayland, lib, @@ -38,12 +43,12 @@ buildGoModule (finalAttrs: { dotool libGL - xorg.libX11.dev - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.libXxf86vm + libx11.dev + libxcursor + libxi + libxinerama + libxrandr + libxxf86vm libxkbcommon wayland ]; diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix index 7687eb10141b..85574bd97d63 100644 --- a/pkgs/by-name/wa/warp-terminal/package.nix +++ b/pkgs/by-name/wa/warp-terminal/package.nix @@ -14,7 +14,10 @@ vulkan-loader, wayland, xdg-utils, - xorg, + libxi, + libxcursor, + libx11, + libxcb, zlib, makeWrapper, waylandSupport ? false, @@ -62,10 +65,10 @@ let stdenv.cc.libc vulkan-loader xdg-utils - xorg.libX11 - xorg.libxcb - xorg.libXcursor - xorg.libXi + libx11 + libxcb + libxcursor + libxi ] ++ lib.optionals waylandSupport [ wayland ]; diff --git a/pkgs/by-name/wa/wasabiwallet/package.nix b/pkgs/by-name/wa/wasabiwallet/package.nix index 9142a698c3e0..c345e1b1c665 100644 --- a/pkgs/by-name/wa/wasabiwallet/package.nix +++ b/pkgs/by-name/wa/wasabiwallet/package.nix @@ -8,7 +8,9 @@ lttng-ust_2_12, fontconfig, openssl, - xorg, + libx11, + libsm, + libice, zlib, }: @@ -19,9 +21,9 @@ let fontconfig.lib openssl (lib.getLib stdenv.cc.cc) - xorg.libX11 - xorg.libICE - xorg.libSM + libx11 + libice + libsm zlib ]; in diff --git a/pkgs/by-name/wa/wasistlos/package.nix b/pkgs/by-name/wa/wasistlos/package.nix index 3b5ae22e2e00..f8ad1c8468b8 100644 --- a/pkgs/by-name/wa/wasistlos/package.nix +++ b/pkgs/by-name/wa/wasistlos/package.nix @@ -23,7 +23,8 @@ pkg-config, webkitgtk_4_1, wrapGAppsHook3, - xorg, + libxtst, + libxdmcp, }: stdenv.mkDerivation (finalAttrs: { @@ -65,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: { pcre2 sqlite webkitgtk_4_1 - xorg.libXdmcp - xorg.libXtst + libxdmcp + libxtst ]; meta = { diff --git a/pkgs/by-name/wa/waywall/package.nix b/pkgs/by-name/wa/waywall/package.nix index 8224a4f7b5bf..1b035e5ee40b 100644 --- a/pkgs/by-name/wa/waywall/package.nix +++ b/pkgs/by-name/wa/waywall/package.nix @@ -14,7 +14,7 @@ wayland, wayland-protocols, wayland-scanner, - xorg, + libxcb, xwayland, }: stdenv.mkDerivation (finalAttrs: { @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { luajit wayland wayland-protocols - xorg.libxcb + libxcb xwayland ]; diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix index 26c70154b1ca..6d9bd5fe990d 100644 --- a/pkgs/by-name/we/weasis/package.nix +++ b/pkgs/by-name/we/weasis/package.nix @@ -8,7 +8,9 @@ makeDesktopItem, makeBinaryWrapper, libGL, - xorg, + libxxf86vm, + libxrender, + libx11, }: let @@ -24,9 +26,9 @@ let runtimeDeps = [ libGL - xorg.libX11 - xorg.libXrender - xorg.libXxf86vm + libx11 + libxrender + libxxf86vm ]; in stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix index 7bf9ed739bbb..7970ca56c2c5 100644 --- a/pkgs/by-name/we/wechat-uos/package.nix +++ b/pkgs/by-name/we/wechat-uos/package.nix @@ -6,7 +6,23 @@ dpkg, nss, nspr, - xorg, + libxt, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxft, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libsm, + libice, + libxshmfence, + libxcb, pango, zlib, atkmm, @@ -72,23 +88,23 @@ let xcbutilimage xcbutilkeysyms xcbutilrenderutil - xorg.libX11 - xorg.libXt - xorg.libXext - xorg.libSM - xorg.libICE - xorg.libxcb + libx11 + libxt + libxext + libsm + libice + libxcb libxkbcommon - xorg.libxshmfence - xorg.libXi - xorg.libXft - xorg.libXcursor - xorg.libXfixes - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXdamage - xorg.libXtst - xorg.libXrandr + libxshmfence + libxi + libxft + libxcursor + libxfixes + libxscrnsaver + libxcomposite + libxdamage + libxtst + libxrandr libnotify atk atkmm @@ -105,7 +121,7 @@ let libva freetype fontconfig - xorg.libXrender + libxrender libuuid expat glib diff --git a/pkgs/by-name/we/wemeet/package.nix b/pkgs/by-name/we/wemeet/package.nix index 8ef0693d9fc5..a7be0cc5fe42 100644 --- a/pkgs/by-name/we/wemeet/package.nix +++ b/pkgs/by-name/we/wemeet/package.nix @@ -6,7 +6,13 @@ autoPatchelfHook, makeWrapper, nss, - xorg, + libxtst, + libxrandr, + libxext, + libxdamage, + libx11, + libsm, + libice, desktop-file-utils, libpulseaudio, libgcrypt, @@ -68,9 +74,9 @@ let libsForQt5.qtwayland opencv4WithoutCuda pipewire - xorg.libXdamage - xorg.libXrandr - xorg.libX11 + libxdamage + libxrandr + libx11 ]; dontWrapQtApps = true; @@ -100,7 +106,7 @@ let buildInputs = [ openssl libpulseaudio - xorg.libX11 + libx11 ]; buildPhase = '' @@ -140,7 +146,7 @@ let nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 + libx11 ]; buildPhase = '' @@ -195,10 +201,10 @@ stdenv.mkDerivation { buildInputs = [ nss - xorg.libX11 - xorg.libSM - xorg.libICE - xorg.libXtst + libx11 + libsm + libice + libxtst desktop-file-utils libpulseaudio libgcrypt @@ -273,7 +279,7 @@ stdenv.mkDerivation { "--set QT_STYLE_OVERRIDE fusion" "--set IBUS_USE_PORTAL 1" "--set XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb" - "--prefix LD_LIBRARY_PATH : $out/app/wemeet/lib:$out/translations:${xorg.libXext}/lib:${xorg.libXdamage}/lib:${opencv4WithoutCuda}/lib:${xorg.libXrandr}/lib" + "--prefix LD_LIBRARY_PATH : $out/app/wemeet/lib:$out/translations:${libxext}/lib:${libxdamage}/lib:${opencv4WithoutCuda}/lib:${libxrandr}/lib" "--prefix PATH : $out/app/wemeet/bin" "--prefix QT_PLUGIN_PATH : $out/app/wemeet/plugins" ]; diff --git a/pkgs/by-name/we/weylus/package.nix b/pkgs/by-name/we/weylus/package.nix index 252b48e911af..914e48afda06 100644 --- a/pkgs/by-name/we/weylus/package.nix +++ b/pkgs/by-name/we/weylus/package.nix @@ -9,7 +9,17 @@ x264, libva, gst_all_1, - xorg, + libxv, + libxtst, + libxrender, + libxrandr, + libxi, + libxinerama, + libxft, + libxfixes, + libxext, + libxcursor, + libxcomposite, libdrm, pkg-config, pango, @@ -42,17 +52,17 @@ rustPlatform.buildRustPackage { dbus libva gst_all_1.gst-plugins-base - xorg.libXext - xorg.libXft - xorg.libXinerama - xorg.libXcursor - xorg.libXrender - xorg.libXfixes - xorg.libXtst - xorg.libXrandr - xorg.libXcomposite - xorg.libXi - xorg.libXv + libxext + libxft + libxinerama + libxcursor + libxrender + libxfixes + libxtst + libxrandr + libxcomposite + libxi + libxv pango libdrm wayland diff --git a/pkgs/by-name/wg/wgpu-native/examples.nix b/pkgs/by-name/wg/wgpu-native/examples.nix index 71619d101641..4e58304514b6 100644 --- a/pkgs/by-name/wg/wgpu-native/examples.nix +++ b/pkgs/by-name/wg/wgpu-native/examples.nix @@ -8,7 +8,8 @@ wgpu-native, glfw, wayland, - xorg, + libxrandr, + libx11, vulkan-loader, version, @@ -41,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wayland - xorg.libX11 - xorg.libXrandr + libx11 + libxrandr ]; runtimeInputs = lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/wi/wiliwili/package.nix b/pkgs/by-name/wi/wiliwili/package.nix index c2d6343c7710..32b5f62a86da 100644 --- a/pkgs/by-name/wi/wiliwili/package.nix +++ b/pkgs/by-name/wi/wiliwili/package.nix @@ -13,7 +13,11 @@ libffi, wayland, egl-wayland, - xorg, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -47,11 +51,11 @@ stdenv.mkDerivation (finalAttrs: { libffi # needed for wayland wayland egl-wayland - xorg.libX11 - xorg.libXrandr - xorg.libXinerama - xorg.libXcursor - xorg.libXi + libx11 + libxrandr + libxinerama + libxcursor + libxi ]; cmakeFlags = [ diff --git a/pkgs/by-name/wi/winbox4/build-from-zip.nix b/pkgs/by-name/wi/winbox4/build-from-zip.nix index 2511666ef38f..9e2773396c7e 100644 --- a/pkgs/by-name/wi/winbox4/build-from-zip.nix +++ b/pkgs/by-name/wi/winbox4/build-from-zip.nix @@ -15,7 +15,11 @@ stdenvNoCC, unzip, writeShellApplication, - xorg, + libxcb-wm, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxcb, zlib, metaCommon ? { }, }: @@ -44,11 +48,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { freetype libGL libxkbcommon - xorg.libxcb - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm + libxcb + libxcb-image + libxcb-keysyms + libxcb-render-util + libxcb-wm zlib ]; diff --git a/pkgs/by-name/wi/windterm/package.nix b/pkgs/by-name/wi/windterm/package.nix index 1d7188b37bec..e99250c70a85 100644 --- a/pkgs/by-name/wi/windterm/package.nix +++ b/pkgs/by-name/wi/windterm/package.nix @@ -10,7 +10,12 @@ glib, alsa-lib, pulseaudio, - xorg, + libxcb-util, + libxcb-render-util, + libxcb-keysyms, + libxcb-image, + libxtst, + libxcb, gtk3, atk, pango, @@ -40,12 +45,12 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libxcb - xorg.xcbutil - xorg.libXtst - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil + libxcb + libxcb-util + libxtst + libxcb-image + libxcb-keysyms + libxcb-render-util libsForQt5.qtbase libsForQt5.qtmultimedia gst_all_1.gst-plugins-base diff --git a/pkgs/by-name/wi/wired/package.nix b/pkgs/by-name/wi/wired/package.nix index dd13a9e2bfc1..37fd5e7a5b44 100644 --- a/pkgs/by-name/wi/wired/package.nix +++ b/pkgs/by-name/wi/wired/package.nix @@ -6,7 +6,11 @@ dbus, pango, cairo, - xorg, + libxscrnsaver, + libxrandr, + libxi, + libxcursor, + libx11, }: rustPlatform.buildRustPackage rec { @@ -29,11 +33,11 @@ rustPlatform.buildRustPackage rec { dbus pango cairo - xorg.libXScrnSaver - xorg.libXcursor - xorg.libXrandr - xorg.libX11 - xorg.libXi + libxscrnsaver + libxcursor + libxrandr + libx11 + libxi ]; postInstall = '' diff --git a/pkgs/by-name/wk/wkhtmltopdf/package.nix b/pkgs/by-name/wk/wkhtmltopdf/package.nix index e9e5f34133eb..28c9e3f58362 100644 --- a/pkgs/by-name/wk/wkhtmltopdf/package.nix +++ b/pkgs/by-name/wk/wkhtmltopdf/package.nix @@ -13,7 +13,8 @@ fontconfig, stdenv, xar, - xorg, + libxrender, + libxext, }: let @@ -50,8 +51,8 @@ let ]; buildInputs = [ - xorg.libXext - xorg.libXrender + libxext + libxrender freetype openssl diff --git a/pkgs/by-name/wm/wmutils-opt/package.nix b/pkgs/by-name/wm/wmutils-opt/package.nix index 90267bf8c43e..19e9948b930d 100644 --- a/pkgs/by-name/wm/wmutils-opt/package.nix +++ b/pkgs/by-name/wm/wmutils-opt/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, libxcb, - xorg, + libxcb-util, }: stdenv.mkDerivation { @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ libxcb - xorg.xcbutil + libxcb-util ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/wo/wolf-shaper/package.nix b/pkgs/by-name/wo/wolf-shaper/package.nix index f573a8dedccd..c51199dc68d2 100644 --- a/pkgs/by-name/wo/wolf-shaper/package.nix +++ b/pkgs/by-name/wo/wolf-shaper/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, libjack2, lv2, - xorg, + libx11, liblo, libGL, libXcursor, @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjack2 lv2 - xorg.libX11 + libx11 liblo libGL libXcursor diff --git a/pkgs/by-name/wo/wonderdraft/package.nix b/pkgs/by-name/wo/wonderdraft/package.nix index b684bc23d9ae..39dc08400cfc 100644 --- a/pkgs/by-name/wo/wonderdraft/package.nix +++ b/pkgs/by-name/wo/wonderdraft/package.nix @@ -3,7 +3,11 @@ stdenv, requireFile, dpkg, - xorg, + libxrandr, + libxi, + libxinerama, + libxcursor, + libx11, libGL, alsa-lib, pulseaudio, @@ -39,11 +43,11 @@ stdenv.mkDerivation rec { preFixup = let libPath = lib.makeLibraryPath [ - xorg.libXcursor - xorg.libXinerama - xorg.libXrandr - xorg.libX11 - xorg.libXi + libxcursor + libxinerama + libxrandr + libx11 + libxi libGL alsa-lib pulseaudio diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix index 7271e7da5e37..29684bc9b139 100644 --- a/pkgs/by-name/wo/wootility/package.nix +++ b/pkgs/by-name/wo/wootility/package.nix @@ -39,7 +39,7 @@ appimageTools.wrapType2 { extraPkgs = pkgs: with pkgs; [ - xorg.libxkbfile + libxkbfile ]; meta = { diff --git a/pkgs/by-name/wo/wox/package.nix b/pkgs/by-name/wo/wox/package.nix index f925c1685956..06d38f5b561f 100644 --- a/pkgs/by-name/wo/wox/package.nix +++ b/pkgs/by-name/wo/wox/package.nix @@ -13,7 +13,8 @@ buildGoModule, pkg-config, autoPatchelfHook, - xorg, + libxtst, + libx11, libxkbcommon, libayatana-appindicator, gtk3, @@ -170,8 +171,8 @@ buildGoModule { ]; buildInputs = [ - xorg.libX11 - xorg.libXtst + libx11 + libxtst libxkbcommon libayatana-appindicator gtk3 diff --git a/pkgs/by-name/wp/wpsoffice-cn/package.nix b/pkgs/by-name/wp/wpsoffice-cn/package.nix index e2e05298aaa6..d2d2c5d24d51 100644 --- a/pkgs/by-name/wp/wpsoffice-cn/package.nix +++ b/pkgs/by-name/wp/wpsoffice-cn/package.nix @@ -22,7 +22,9 @@ unixODBC, libmysqlclient, libsForQt5, - xorg, + libxv, + libxtst, + libxdamage, # wpsoffice runtime dependencies cups, dbus, @@ -145,9 +147,9 @@ else libusb1 unixODBC libsForQt5.qtbase - xorg.libXdamage - xorg.libXtst - xorg.libXv + libxdamage + libxtst + libxv ]; dontWrapQtApps = true; diff --git a/pkgs/by-name/wp/wpsoffice/package.nix b/pkgs/by-name/wp/wpsoffice/package.nix index 5f1243d51d7b..09194f9491e7 100644 --- a/pkgs/by-name/wp/wpsoffice/package.nix +++ b/pkgs/by-name/wp/wpsoffice/package.nix @@ -12,7 +12,9 @@ libtiff, udev, gtk3, - xorg, + libxv, + libxtst, + libxdamage, cups, pango, runCommandLocal, @@ -74,9 +76,9 @@ stdenv.mkDerivation rec { udev gtk3 libsForQt5.qt5.qtbase - xorg.libXdamage - xorg.libXtst - xorg.libXv + libxdamage + libxtst + libxv ]; dontWrapQtApps = true; diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index 04a2486fbbdf..e90368e03e24 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -11,7 +11,7 @@ cacert, llvmPackages, musl, - xorg, + libx11, jq, moreutils, nix-update-script, @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ musl # not used, but requires extra work to remove - xorg.libX11 # for the clipboardy package + libx11 # for the clipboardy package ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/wt/wtk/package.nix b/pkgs/by-name/wt/wtk/package.nix index a66ab691fd09..4bf6b5fc370b 100644 --- a/pkgs/by-name/wt/wtk/package.nix +++ b/pkgs/by-name/wt/wtk/package.nix @@ -3,7 +3,11 @@ stdenv, requireFile, unzip, - xorg, + libxt, + libxpm, + libx11, + libsm, + libice, }: stdenv.mkDerivation rec { @@ -21,11 +25,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; libraries = [ - xorg.libXpm - xorg.libXt - xorg.libX11 - xorg.libICE - xorg.libSM + libxpm + libxt + libx11 + libice + libsm stdenv.cc.cc ]; diff --git a/pkgs/by-name/wx/wxmacmolplt/package.nix b/pkgs/by-name/wx/wxmacmolplt/package.nix index b43d356a0c1e..5e8c968fa687 100644 --- a/pkgs/by-name/wx/wxmacmolplt/package.nix +++ b/pkgs/by-name/wx/wxmacmolplt/package.nix @@ -6,7 +6,7 @@ libGL, libGLU, pkg-config, - xorg, + libx11, autoreconfHook, wrapGAppsHook4, }: @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { wxGTK32 libGL libGLU - xorg.libX11 - xorg.libX11.dev + libx11 + libx11.dev ]; configureFlags = [ "LDFLAGS=-lGL" ]; diff --git a/pkgs/by-name/x-/x-create-mouse-void/package.nix b/pkgs/by-name/x-/x-create-mouse-void/package.nix index bfa49b5ca45a..254e92734cb5 100644 --- a/pkgs/by-name/x-/x-create-mouse-void/package.nix +++ b/pkgs/by-name/x-/x-create-mouse-void/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - xorg, + libx11, fetchFromGitHub, }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "151pv4gmzz9g6nd1xw94hmawlb5z8rgs1jb3x1zpvn3znd7f355c"; }; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/x1/x11_ssh_askpass/package.nix b/pkgs/by-name/x1/x11_ssh_askpass/package.nix index f7753cc30706..758ee40a3b5b 100644 --- a/pkgs/by-name/x1/x11_ssh_askpass/package.nix +++ b/pkgs/by-name/x1/x11_ssh_askpass/package.nix @@ -5,7 +5,10 @@ fetchDebianPatch, autoreconfHook, pkg-config, - xorg, + libxt, + libx11, + libsm, + libice, }: stdenv.mkDerivation rec { @@ -38,10 +41,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xorg.libX11 - xorg.libXt - xorg.libICE - xorg.libSM + libx11 + libxt + libice + libsm ]; meta = { diff --git a/pkgs/by-name/x1/x11docker/package.nix b/pkgs/by-name/x1/x11docker/package.nix index cbd6ac36c245..b7a21a2fdeec 100644 --- a/pkgs/by-name/x1/x11docker/package.nix +++ b/pkgs/by-name/x1/x11docker/package.nix @@ -4,7 +4,12 @@ fetchFromGitHub, makeWrapper, nx-libs, - xorg, + xrandr, + xinit, + xhost, + xdpyinfo, + xauth, + libxcvt, getopt, gnugrep, gawk, @@ -46,18 +51,18 @@ stdenv.mkDerivation { mount iproute2 nx-libs - xorg.xdpyinfo - xorg.xhost - xorg.xinit + xdpyinfo + xhost + xinit python3 jq - xorg.libxcvt + libxcvt wmctrl xdotool xclip xpra - xorg.xrandr - xorg.xauth + xrandr + xauth weston xwayland ] diff --git a/pkgs/by-name/x1/x11spice/package.nix b/pkgs/by-name/x1/x11spice/package.nix index 3aa2b7f19871..1e3d42e4dc31 100644 --- a/pkgs/by-name/x1/x11spice/package.nix +++ b/pkgs/by-name/x1/x11spice/package.nix @@ -4,7 +4,9 @@ fetchFromGitLab, autoreconfHook, pkg-config, - xorg, + libxcb-util, + util-macros, + libxcb, gtk2, spice, spice-protocol, @@ -28,9 +30,9 @@ stdenv.mkDerivation { ]; buildInputs = [ - xorg.libxcb - xorg.xcbutil - xorg.utilmacros + libxcb + libxcb-util + util-macros gtk2 spice spice-protocol diff --git a/pkgs/by-name/x1/x11vnc/package.nix b/pkgs/by-name/x1/x11vnc/package.nix index 903076a5762f..c46c337048b2 100644 --- a/pkgs/by-name/x1/x11vnc/package.nix +++ b/pkgs/by-name/x1/x11vnc/package.nix @@ -5,7 +5,18 @@ openssl, zlib, libjpeg, - xorg, + libxtst, + libxrender, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxext, + libxdamage, + libx11, + xorgproto, + xdpyinfo, + xauth, coreutils, libvncserver, autoreconfHook, @@ -29,19 +40,19 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libXfixes - xorg.xorgproto + libxfixes + xorgproto openssl - xorg.libXdamage + libxdamage zlib - xorg.libX11 + libx11 libjpeg - xorg.libXtst - xorg.libXinerama - xorg.libXrandr - xorg.libXext - xorg.libXi - xorg.libXrender + libxtst + libxinerama + libxrandr + libxext + libxi + libxrender libvncserver ]; @@ -50,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail '"/bin/su"' '"/run/wrappers/bin/su"' \ --replace-fail '"/bin/true"' '"${coreutils}/bin/true"' - sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' src/ssltools.h + sed -i -e '/#!\/bin\/sh/a"PATH=${xdpyinfo}\/bin:${xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' src/ssltools.h # Xdummy script is currently broken, so we avoid building it. This removes everything Xdummy-related from the affected Makefile sed -i '/if HAVE_X11/,/endif/d' misc/Makefile.am diff --git a/pkgs/by-name/x2/x2goserver/package.nix b/pkgs/by-name/x2/x2goserver/package.nix index 482303c7dafb..bcad5aded4b3 100644 --- a/pkgs/by-name/x2/x2goserver/package.nix +++ b/pkgs/by-name/x2/x2goserver/package.nix @@ -14,7 +14,14 @@ gnused, gnugrep, findutils, - xorg, + font-util, + xwininfo, + xrandr, + xmodmap, + xkbcomp, + xinit, + xauth, + setxkbmap, net-tools, iproute2, bc, @@ -86,14 +93,14 @@ let pwgen openssh sshfs - xorg.xauth - xorg.xinit - xorg.xrandr - xorg.xmodmap - xorg.xwininfo - xorg.fontutil - xorg.xkbcomp - xorg.setxkbmap + xauth + xinit + xrandr + xmodmap + xwininfo + font-util + xkbcomp + setxkbmap ]; in stdenv.mkDerivation { diff --git a/pkgs/by-name/x2/x2vnc/package.nix b/pkgs/by-name/x2/x2vnc/package.nix index 707d4b287791..5496cbfb2474 100644 --- a/pkgs/by-name/x2/x2vnc/package.nix +++ b/pkgs/by-name/x2/x2vnc/package.nix @@ -2,7 +2,10 @@ lib, stdenv, fetchurl, - xorg, + libxrandr, + libxext, + libx11, + xorgproto, }: stdenv.mkDerivation rec { @@ -17,10 +20,10 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-std=gnu89"; buildInputs = [ - xorg.libX11 - xorg.xorgproto - xorg.libXext - xorg.libXrandr + libx11 + xorgproto + libxext + libxrandr ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix index e941332d231a..e2d6fba185fd 100644 --- a/pkgs/by-name/xa/xapp/package.nix +++ b/pkgs/by-name/xa/xapp/package.nix @@ -6,7 +6,7 @@ libgnomekbd, gdk-pixbuf, cairo, - xorg, + libxkbfile, meson, ninja, pkg-config, @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { )) libgnomekbd gdk-pixbuf - xorg.libxkbfile + libxkbfile python3.pkgs.pygobject3 # for .pc file mate.mate-panel # for gobject-introspection dbus diff --git a/pkgs/by-name/xa/xastir/package.nix b/pkgs/by-name/xa/xastir/package.nix index 5291e5565ff6..4daf9abf5022 100644 --- a/pkgs/by-name/xa/xastir/package.nix +++ b/pkgs/by-name/xa/xastir/package.nix @@ -10,7 +10,8 @@ gnused, libgeotiff, libtiff, - xorg, + libxt, + libxpm, motif, pcre2, perl, @@ -43,8 +44,8 @@ stdenv.mkDerivation rec { db libgeotiff libtiff - xorg.libXpm - xorg.libXt + libxpm + libxt motif pcre2 perl diff --git a/pkgs/by-name/xa/xautoclick/package.nix b/pkgs/by-name/xa/xautoclick/package.nix index 7462d85f1499..e1d90009050c 100644 --- a/pkgs/by-name/xa/xautoclick/package.nix +++ b/pkgs/by-name/xa/xautoclick/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, fetchpatch, - xorg, + libxtst, pkg-config, cmake, libevdev, @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libevdev - xorg.libXtst + libxtst ] ++ lib.optionals gtkSupport [ gtk3 diff --git a/pkgs/by-name/xc/xcircuit/package.nix b/pkgs/by-name/xc/xcircuit/package.nix index 395eb0787c50..eb919d73a5bd 100644 --- a/pkgs/by-name/xc/xcircuit/package.nix +++ b/pkgs/by-name/xc/xcircuit/package.nix @@ -10,7 +10,11 @@ ngspice, tcl, tk, - xorg, + libxt, + libxpm, + libx11, + libsm, + libice, zlib, }: @@ -46,11 +50,11 @@ stdenv.mkDerivation { buildInputs = [ cairo ghostscript - xorg.libSM - xorg.libXt - xorg.libICE - xorg.libX11 - xorg.libXpm + libsm + libxt + libice + libx11 + libxpm tcl tk zlib diff --git a/pkgs/by-name/xc/xcur2png/package.nix b/pkgs/by-name/xc/xcur2png/package.nix index be8a849c45f6..863fd2ec4e32 100644 --- a/pkgs/by-name/xc/xcur2png/package.nix +++ b/pkgs/by-name/xc/xcur2png/package.nix @@ -5,7 +5,9 @@ fetchpatch, pkg-config, libpng, - xorg, + libxcursor, + libx11, + xorgproto, }: stdenv.mkDerivation rec { @@ -43,9 +45,9 @@ stdenv.mkDerivation rec { buildInputs = [ libpng - xorg.libX11 - xorg.libXcursor - xorg.xorgproto + libx11 + libxcursor + xorgproto ]; meta = { diff --git a/pkgs/by-name/xd/xdg-launch/package.nix b/pkgs/by-name/xd/xdg-launch/package.nix index 819931913e7a..3f15b25238b4 100644 --- a/pkgs/by-name/xd/xdg-launch/package.nix +++ b/pkgs/by-name/xd/xdg-launch/package.nix @@ -9,7 +9,8 @@ perl, pkg-config, glib, - xorg, + libxrandr, + libx11, }: stdenv.mkDerivation rec { pname = "xdg-launch"; @@ -34,8 +35,8 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; buildInputs = [ - xorg.libX11 - xorg.libXrandr + libx11 + libxrandr glib # can be optional ]; diff --git a/pkgs/by-name/xd/xdummy/package.nix b/pkgs/by-name/xd/xdummy/package.nix index d9c27616e29b..fd7783218ef7 100644 --- a/pkgs/by-name/xd/xdummy/package.nix +++ b/pkgs/by-name/xd/xdummy/package.nix @@ -2,6 +2,15 @@ writeText, writeScriptBin, xorg, + xorg-server, + xf86-video-dummy, + font-misc-misc, + font-cursor-misc, + font-bh-lucidatypewriter-75dpi, + font-bh-lucidatypewriter-100dpi, + font-bh-100dpi, + font-adobe-75dpi, + font-adobe-100dpi, xkeyboard_config, runtimeShell, unfreeFonts ? false, @@ -26,17 +35,17 @@ let EndSection Section "Files" - ModulePath "${xorg.xorgserver.out}/lib/xorg/modules" - ModulePath "${xorg.xf86videodummy}/lib/xorg/modules" + ModulePath "${xorg-server.out}/lib/xorg/modules" + ModulePath "${xf86-video-dummy}/lib/xorg/modules" XkbDir "${xkeyboard_config}/share/X11/xkb" - FontPath "${xorg.fontadobe75dpi}/share/fonts/X11/75dpi" - FontPath "${xorg.fontadobe100dpi}/share/fonts/X11/100dpi" - FontPath "${xorg.fontmiscmisc}/share/fonts/X11/misc" - FontPath "${xorg.fontcursormisc}/share/fonts/X11/misc" + FontPath "${font-adobe-75dpi}/share/fonts/X11/75dpi" + FontPath "${font-adobe-100dpi}/share/fonts/X11/100dpi" + FontPath "${font-misc-misc}/share/fonts/X11/misc" + FontPath "${font-cursor-misc}/share/fonts/X11/misc" ${lib.optionalString unfreeFonts '' - FontPath "${xorg.fontbhlucidatypewriter75dpi}/share/fonts/X11/75dpi" - FontPath "${xorg.fontbhlucidatypewriter100dpi}/share/fonts/X11/100dpi" - FontPath "${xorg.fontbh100dpi}/share/fonts/X11/100dpi" + FontPath "${font-bh-lucidatypewriter-75dpi}/share/fonts/X11/75dpi" + FontPath "${font-bh-lucidatypewriter-100dpi}/share/fonts/X11/100dpi" + FontPath "${font-bh-100dpi}/share/fonts/X11/100dpi" ''} EndSection @@ -85,7 +94,7 @@ let in writeScriptBin "xdummy" '' #!${runtimeShell} - exec ${xorg.xorgserver.out}/bin/Xorg \ + exec ${xorg-server.out}/bin/Xorg \ -noreset \ -logfile /dev/null \ "$@" \ diff --git a/pkgs/by-name/xe/xephem/package.nix b/pkgs/by-name/xe/xephem/package.nix index edaec00e8670..f57ce374bcce 100644 --- a/pkgs/by-name/xe/xephem/package.nix +++ b/pkgs/by-name/xe/xephem/package.nix @@ -9,7 +9,9 @@ motif, openssl, groff, - xorg, + libxt, + libxmu, + libxext, }: stdenv.mkDerivation rec { @@ -32,9 +34,9 @@ stdenv.mkDerivation rec { buildInputs = [ motif openssl - xorg.libXmu - xorg.libXext - xorg.libXt + libxmu + libxext + libxt ]; patches = [ diff --git a/pkgs/by-name/xf/xf86-input-joystick/package.nix b/pkgs/by-name/xf/xf86-input-joystick/package.nix index d0cb2023196d..81df0d68b440 100644 --- a/pkgs/by-name/xf/xf86-input-joystick/package.nix +++ b/pkgs/by-name/xf/xf86-input-joystick/package.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ ]; pkgConfigModules = [ "xorg-joystick" ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputjoystick.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-input-joystick.x86_64-darwin }; }) diff --git a/pkgs/by-name/xf/xf86-input-void/package.nix b/pkgs/by-name/xf/xf86-input-void/package.nix index c52742e08170..03749b3da67e 100644 --- a/pkgs/by-name/xf/xf86-input-void/package.nix +++ b/pkgs/by-name/xf/xf86-input-void/package.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: { ]; maintainers = [ ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputvoid.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-input-void.x86_64-darwin }; }) diff --git a/pkgs/by-name/xf/xf86-video-suncg6/package.nix b/pkgs/by-name/xf/xf86-video-suncg6/package.nix index 22569598238e..18dc2e1457e1 100644 --- a/pkgs/by-name/xf/xf86-video-suncg6/package.nix +++ b/pkgs/by-name/xf/xf86-video-suncg6/package.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.hpndSellVariant; maintainers = [ ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosuncg6.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-video-suncg6.x86_64-darwin }; }) diff --git a/pkgs/by-name/xf/xf86-video-sunffb/package.nix b/pkgs/by-name/xf/xf86-video-sunffb/package.nix index 7210e22cc6c7..823adb0d851f 100644 --- a/pkgs/by-name/xf/xf86-video-sunffb/package.nix +++ b/pkgs/by-name/xf/xf86-video-sunffb/package.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunffb.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-video-sunffb.x86_64-darwin }; }) diff --git a/pkgs/by-name/xf/xf86-video-sunleo/package.nix b/pkgs/by-name/xf/xf86-video-sunleo/package.nix index 57ddb2ac63cd..3b2b97d04693 100644 --- a/pkgs/by-name/xf/xf86-video-sunleo/package.nix +++ b/pkgs/by-name/xf/xf86-video-sunleo/package.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunleo.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xf86-video-sunleo.x86_64-darwin }; }) diff --git a/pkgs/by-name/xf/xfe/package.nix b/pkgs/by-name/xf/xfe/package.nix index 3bfa2f758773..24d2187bb817 100644 --- a/pkgs/by-name/xf/xfe/package.nix +++ b/pkgs/by-name/xf/xfe/package.nix @@ -12,7 +12,8 @@ intltool, file, libpng, - xorg, + libxft, + libx11, }: stdenv.mkDerivation rec { @@ -37,8 +38,8 @@ stdenv.mkDerivation rec { libpng fontconfig freetype - xorg.libX11 - xorg.libXft + libx11 + libxft ]; preConfigure = '' diff --git a/pkgs/by-name/xi/xidlehook/package.nix b/pkgs/by-name/xi/xidlehook/package.nix index 5a15922e7a64..7c4134448272 100644 --- a/pkgs/by-name/xi/xidlehook/package.nix +++ b/pkgs/by-name/xi/xidlehook/package.nix @@ -4,7 +4,9 @@ rustPlatform, fetchFromGitLab, python3, - xorg, + libxscrnsaver, + libx11, + libxcb, libpulseaudio, pkg-config, patchelf, @@ -27,9 +29,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-U1kjOWrFEp1pZnbawW2MCtC4UN7ELD/kcYWfEmn94Pg="; buildInputs = [ - xorg.libX11 - xorg.libxcb - xorg.libXScrnSaver + libx11 + libxcb + libxscrnsaver libpulseaudio ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/xi/xinput-calibrator/package.nix b/pkgs/by-name/xi/xinput-calibrator/package.nix index af2c8a1a8a0f..448bfffed48c 100644 --- a/pkgs/by-name/xi/xinput-calibrator/package.nix +++ b/pkgs/by-name/xi/xinput-calibrator/package.nix @@ -6,7 +6,9 @@ pkg-config, meson, ninja, - xorg, + libxrandr, + libxi, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -29,9 +31,9 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libX11 - xorg.libXi - xorg.libXrandr + libx11 + libxi + libxrandr ]; meta = { diff --git a/pkgs/by-name/xj/xjadeo/package.nix b/pkgs/by-name/xj/xjadeo/package.nix index 2e6205de3867..5648c4366718 100644 --- a/pkgs/by-name/xj/xjadeo/package.nix +++ b/pkgs/by-name/xj/xjadeo/package.nix @@ -12,7 +12,8 @@ libXv, pkg-config, portmidi, - xorg, + libxpm, + libxext, }: stdenv.mkDerivation (finalAttrs: { @@ -35,8 +36,8 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg libjack2 libX11 - xorg.libXext - xorg.libXpm + libxext + libxpm # The following are recommended in the README, but are seemingly # unnecessary for a successful build. That said, the result of including # these in the build process is possibly required at runtime in some cases, diff --git a/pkgs/by-name/xl/xlayoutdisplay/package.nix b/pkgs/by-name/xl/xlayoutdisplay/package.nix index d2c1ed77e302..79edc6725677 100644 --- a/pkgs/by-name/xl/xlayoutdisplay/package.nix +++ b/pkgs/by-name/xl/xlayoutdisplay/package.nix @@ -3,7 +3,9 @@ stdenv, fetchFromGitHub, pkg-config, - xorg, + libxrandr, + libxcursor, + libx11, boost, gtest, }: @@ -21,9 +23,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 - xorg.libXrandr - xorg.libXcursor + libx11 + libxrandr + libxcursor boost ]; nativeCheckInputs = [ gtest ]; diff --git a/pkgs/by-name/xl/xlife/package.nix b/pkgs/by-name/xl/xlife/package.nix index c5519e0ddbf9..40fc03671927 100644 --- a/pkgs/by-name/xl/xlife/package.nix +++ b/pkgs/by-name/xl/xlife/package.nix @@ -2,7 +2,9 @@ lib, stdenv, fetchsvn, - xorg, + libx11, + imake, + gccmakedep, }: stdenv.mkDerivation { @@ -16,10 +18,10 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - xorg.imake - xorg.gccmakedep + imake + gccmakedep ]; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; hardeningDisable = [ "format" ]; installPhase = '' diff --git a/pkgs/by-name/xl/xlogo/package.nix b/pkgs/by-name/xl/xlogo/package.nix index ea6d02a00263..546a8f2b8b9a 100644 --- a/pkgs/by-name/xl/xlogo/package.nix +++ b/pkgs/by-name/xl/xlogo/package.nix @@ -2,7 +2,12 @@ lib, stdenv, fetchFromGitLab, - xorg, + libxt, + libxmu, + libxext, + libxaw, + libx11, + libsm, autoreconfHook, pkg-config, util-macros, @@ -30,12 +35,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-appdefaultdir=$out/share/X11/app-defaults" ]; buildInputs = [ - xorg.libX11 - xorg.libXext - xorg.libSM - xorg.libXmu - xorg.libXaw - xorg.libXt + libx11 + libxext + libsm + libxmu + libxaw + libxt ]; meta = { diff --git a/pkgs/by-name/xm/xmind/package.nix b/pkgs/by-name/xm/xmind/package.nix index fafd6faf69af..cfa43153261a 100644 --- a/pkgs/by-name/xm/xmind/package.nix +++ b/pkgs/by-name/xm/xmind/package.nix @@ -17,7 +17,14 @@ libxkbcommon, alsa-lib, expat, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxkbfile, + libxcb, libgbm, systemd, libGL, @@ -39,14 +46,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ (lib.getLib stdenv.cc.cc) - xorg.libX11 - xorg.libXext - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXfixes - xorg.libXrandr - xorg.libxkbfile + libx11 + libxext + libxcb + libxcomposite + libxdamage + libxfixes + libxrandr + libxkbfile glib at-spi2-atk cairo diff --git a/pkgs/by-name/xm/xmonad_log_applet/package.nix b/pkgs/by-name/xm/xmonad_log_applet/package.nix index 069d5e9a9604..35ee0988a8f2 100644 --- a/pkgs/by-name/xm/xmonad_log_applet/package.nix +++ b/pkgs/by-name/xm/xmonad_log_applet/package.nix @@ -7,7 +7,7 @@ glib, dbus-glib, desktopSupport ? "gnomeflashback", - xorg, + libxcb-wm, gtk2, gtk3, gnome-panel, @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus-glib - xorg.xcbutilwm + libxcb-wm ] ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 diff --git a/pkgs/by-name/xm/xmousepasteblock/package.nix b/pkgs/by-name/xm/xmousepasteblock/package.nix index 5dfbd650e64b..4304632e50e6 100644 --- a/pkgs/by-name/xm/xmousepasteblock/package.nix +++ b/pkgs/by-name/xm/xmousepasteblock/package.nix @@ -1,5 +1,7 @@ { - xorg, + libxi, + libxext, + libx11, lib, stdenv, libev, @@ -21,9 +23,9 @@ stdenv.mkDerivation rec { "CC=${stdenv.cc.targetPrefix}cc" ]; buildInputs = [ - xorg.libX11 - xorg.libXext - xorg.libXi + libx11 + libxext + libxi libev ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/xn/xneur/package.nix b/pkgs/by-name/xn/xneur/package.nix index 20231a0d4f49..4cbda825a2b9 100644 --- a/pkgs/by-name/xn/xneur/package.nix +++ b/pkgs/by-name/xn/xneur/package.nix @@ -13,7 +13,10 @@ gst_all_1, libnotify, pcre, - xorg, + libxtst, + libxi, + libxext, + libx11, xosd, }: @@ -42,10 +45,10 @@ stdenv.mkDerivation { gst_all_1.gstreamer libnotify pcre - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXtst + libx11 + libxext + libxi + libxtst xosd ]; diff --git a/pkgs/by-name/xo/xob/package.nix b/pkgs/by-name/xo/xob/package.nix index 7d154259a796..6a8cc7f4dd83 100644 --- a/pkgs/by-name/xo/xob/package.nix +++ b/pkgs/by-name/xo/xob/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, pkg-config, - xorg, + libxrender, + libx11, libconfig, }: @@ -20,8 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - xorg.libX11 - xorg.libXrender + libx11 + libxrender libconfig ]; diff --git a/pkgs/by-name/xo/xorg_sys_opengl/package.nix b/pkgs/by-name/xo/xorg_sys_opengl/package.nix index aa5ff17b17fc..ddb1b4e7fe8b 100644 --- a/pkgs/by-name/xo/xorg_sys_opengl/package.nix +++ b/pkgs/by-name/xo/xorg_sys_opengl/package.nix @@ -9,7 +9,8 @@ { lib, stdenv, - xorg, + libxxf86vm, + libxext, expat, libdrm, }: @@ -19,8 +20,8 @@ stdenv.mkDerivation { version = "3"; builder = ./builder.sh; neededLibs = map (p: p.out) [ - xorg.libXxf86vm - xorg.libXext + libxxf86vm + libxext expat libdrm stdenv.cc.cc diff --git a/pkgs/by-name/xo/xosd-xft/package.nix b/pkgs/by-name/xo/xosd-xft/package.nix index 489c53e43e88..bf44b4f28692 100644 --- a/pkgs/by-name/xo/xosd-xft/package.nix +++ b/pkgs/by-name/xo/xosd-xft/package.nix @@ -5,7 +5,9 @@ versionCheckHook, nix-update-script, pkg-config, - xorg, + libxrandr, + libxinerama, + libxft, }: stdenv.mkDerivation (finalAttrs: { @@ -23,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; buildInputs = [ - xorg.libXft - xorg.libXrandr - xorg.libXinerama + libxft + libxrandr + libxinerama ]; nativeInstallCheckInputs = [ diff --git a/pkgs/by-name/xp/xplugd/package.nix b/pkgs/by-name/xp/xplugd/package.nix index 8dbf7e6a35fa..1d7cea09fc74 100644 --- a/pkgs/by-name/xp/xplugd/package.nix +++ b/pkgs/by-name/xp/xplugd/package.nix @@ -1,7 +1,10 @@ { lib, stdenv, - xorg, + libxrandr, + libxi, + libxext, + libx11, pkg-config, fetchFromGitHub, autoreconfHook, @@ -19,10 +22,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ - xorg.libX11 - xorg.libXi - xorg.libXrandr - xorg.libXext + libx11 + libxi + libxrandr + libxext ]; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix index f1562e55a8ac..7dbd007fbd95 100644 --- a/pkgs/by-name/xp/xpra/package.nix +++ b/pkgs/by-name/xp/xpra/package.nix @@ -42,6 +42,19 @@ xauth, xdg-utils, xorg, + xkeyboard-config, + xf86-video-dummy, + libxtst, + libxres, + libxrender, + libxrandr, + libxi, + libxfixes, + libxdamage, + libxcomposite, + libx11, + xorgproto, + libxkbfile, xorgserver, xxHash, clang, @@ -53,7 +66,7 @@ let inherit (python3.pkgs) cython buildPythonApplication; - xf86videodummy = xorg.xf86videodummy.overrideDerivation (p: { + xf86videodummy = xf86-video-dummy.overrideDerivation (p: { patches = [ # patch provided by Xpra upstream ./0002-Constant-DPI.patch @@ -127,17 +140,17 @@ effectiveBuildPythonApplication rec { ++ lib.optional withNvenc cudatoolkit; buildInputs = [ - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXfixes - xorg.libXi - xorg.libxkbfile - xorg.libXrandr - xorg.libXrender - xorg.libXres - xorg.libXtst - xorg.xorgproto + libx11 + libxcomposite + libxdamage + libxfixes + libxi + libxkbfile + libxrandr + libxrender + libxres + libxtst + xorgproto ] ++ (with gst_all_1; [ gst-libav @@ -236,7 +249,7 @@ effectiveBuildPythonApplication rec { "''${gappsWrapperArgs[@]}" --set XPRA_INSTALL_PREFIX "$out" --set XPRA_COMMAND "$out/bin/xpra" - --set XPRA_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" + --set XPRA_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb" --set XORG_CONFIG_PREFIX "" --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib --prefix PATH : ${ diff --git a/pkgs/by-name/xp/xprintidle/package.nix b/pkgs/by-name/xp/xprintidle/package.nix index e02794af1927..8928cf4db061 100644 --- a/pkgs/by-name/xp/xprintidle/package.nix +++ b/pkgs/by-name/xp/xprintidle/package.nix @@ -5,7 +5,9 @@ meson, ninja, pkg-config, - xorg, + libxscrnsaver, + libxext, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -26,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - xorg.libXScrnSaver - xorg.libX11 - xorg.libXext + libxscrnsaver + libx11 + libxext ]; meta = { diff --git a/pkgs/by-name/xq/xquartz/package.nix b/pkgs/by-name/xq/xquartz/package.nix index 7e9fe7e558cf..99098e7bdf8e 100644 --- a/pkgs/by-name/xq/xquartz/package.nix +++ b/pkgs/by-name/xq/xquartz/package.nix @@ -5,7 +5,60 @@ makeFontsConf, gnused, writeScript, - xorg, + xorg-server, + tab-window-manager, + libxpm, + font-util, + font-misc-misc, + font-cursor-misc, + font-bh-lucidatypewriter-75dpi, + font-bh-lucidatypewriter-100dpi, + font-bh-100dpi, + font-encodings, + xwud, + xwininfo, + xwd, + xvinfo, + xset, + xsetroot, + xrefresh, + xrdb, + xrandr, + xpr, + xprop, + xmodmap, + xmessage, + xlsclients, + xlsatoms, + xkill, + xkbutils, + xkbevd, + xkbcomp, + xinput, + xinit, + xhost, + xgamma, + xfs, + xeyes, + xev, + xdriinfo, + xdpyinfo, + xdm, + xcursorgen, + xcmsdb, + xclock, + xbacklight, + xauth, + x11perf, + smproxy, + setxkbmap, + sessreg, + mkfontscale, + makedepend, + luit, + lndir, + iceauth, + bdftopcf, bashInteractive, xterm, xcbuild, @@ -81,13 +134,13 @@ let ttf_bitstream_vera freefont_ttf liberation_ttf - xorg.fontmiscmisc - xorg.fontcursormisc + font-misc-misc + font-cursor-misc ] ++ lib.optionals unfreeFonts [ - xorg.fontbhlucidatypewriter100dpi - xorg.fontbhlucidatypewriter75dpi - xorg.fontbh100dpi + font-bh-lucidatypewriter-100dpi + font-bh-lucidatypewriter-75dpi + font-bh-100dpi ] ++ extraFontDirs; fontsConf = makeFontsConf { @@ -108,58 +161,58 @@ let # xorg xlsfonts xfontsel - xorg.bdftopcf - xorg.fontutil - xorg.iceauth - xorg.libXpm - xorg.lndir - xorg.luit - xorg.makedepend - xorg.mkfontdir - xorg.mkfontscale - xorg.sessreg - xorg.setxkbmap - xorg.smproxy - xorg.twm - xorg.x11perf - xorg.xauth - xorg.xbacklight - xorg.xclock - xorg.xcmsdb - xorg.xcursorgen - xorg.xdm - xorg.xdpyinfo - xorg.xdriinfo - xorg.xev - xorg.xeyes - xorg.xfs - xorg.xgamma - xorg.xhost - xorg.xinput - xorg.xkbcomp - xorg.xkbevd - xorg.xkbutils - xorg.xkill - xorg.xlsatoms - xorg.xlsclients - xorg.xmessage - xorg.xmodmap - xorg.xpr - xorg.xprop - xorg.xrandr - xorg.xrdb - xorg.xrefresh - xorg.xset - xorg.xsetroot - xorg.xvinfo - xorg.xwd - xorg.xwininfo - xorg.xwud + bdftopcf + font-util + iceauth + libxpm + lndir + luit + makedepend + mkfontscale + mkfontscale + sessreg + setxkbmap + smproxy + tab-window-manager + x11perf + xauth + xbacklight + xclock + xcmsdb + xcursorgen + xdm + xdpyinfo + xdriinfo + xev + xeyes + xfs + xgamma + xhost + xinput + xkbcomp + xkbevd + xkbutils + xkill + xlsatoms + xlsclients + xmessage + xmodmap + xpr + xprop + xrandr + xrdb + xrefresh + xset + xsetroot + xvinfo + xwd + xwininfo + xwud ]; in stdenv.mkDerivation { pname = "xquartz"; - version = lib.getVersion xorg.xorgserver; + version = lib.getVersion xorg-server; nativeBuildInputs = [ makeWrapper ]; @@ -168,9 +221,9 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' - cp -rT ${xorg.xinit} $out + cp -rT ${xinit} $out chmod -R u+w $out - cp -rT ${xorg.xorgserver} $out + cp -rT ${xorg-server} $out chmod -R u+w $out cp ${installer} $out/bin/xquartz-install @@ -181,10 +234,10 @@ stdenv.mkDerivation { cp ${fontsConf} $fontsConfPath substituteInPlace $out/bin/startx \ - --replace "bindir=${xorg.xinit}/bin" "bindir=$out/bin" \ - --replace 'defaultserver=${xorg.xorgserver}/bin/X' "defaultserver=$out/bin/Xquartz" \ - --replace "${xorg.xinit}" "$out" \ - --replace "${xorg.xorgserver}" "$out" \ + --replace "bindir=${xinit}/bin" "bindir=$out/bin" \ + --replace 'defaultserver=${xorg-server}/bin/X' "defaultserver=$out/bin/Xquartz" \ + --replace "${xinit}" "$out" \ + --replace "${xorg-server}" "$out" \ --replace "eval xinit" "eval $out/bin/xinit" \ --replace "sysclientrc=/etc/X11/xinit/xinitrc" "sysclientrc=$out/etc/X11/xinit/xinitrc" @@ -203,16 +256,16 @@ stdenv.mkDerivation { EOF substituteInPlace $out/etc/X11/xinit/xinitrc \ - --replace ${xorg.xinit} $out \ - --replace xmodmap ${xorg.xmodmap}/bin/xmodmap \ - --replace xrdb ${xorg.xrdb}/bin/xrdb + --replace ${xinit} $out \ + --replace xmodmap ${xmodmap}/bin/xmodmap \ + --replace xrdb ${xrdb}/bin/xrdb mkdir -p $out/etc/X11/xinit/xinitrc.d cp ${./10-fontdir.sh} $out/etc/X11/xinit/xinitrc.d/10-fontdir.sh substituteInPlace $out/etc/X11/xinit/xinitrc.d/10-fontdir.sh \ --subst-var-by "SYSTEM_FONTS" "${fonts}/share/X11-fonts/" \ - --subst-var-by "XSET" "${xorg.xset}/bin/xset" + --subst-var-by "XSET" "${xset}/bin/xset" cp ${./98-user.sh} $out/etc/X11/xinit/xinitrc.d/98-user.sh @@ -222,15 +275,15 @@ stdenv.mkDerivation { chmod +x $out/etc/X11/xinit/xinitrc.d/99-quartz-wm.sh substituteInPlace $out/etc/X11/xinit/privileged_startx.d/20-font_cache \ - --replace ${xorg.xinit} $out + --replace ${xinit} $out cp ${./font_cache} $out/bin/font_cache substituteInPlace $out/bin/font_cache \ --subst-var-by "shell" "${stdenv.shell}" \ --subst-var-by "PATH" "$out/bin" \ - --subst-var-by "ENCODINGSDIR" "${xorg.encodings}/share/fonts/X11/encodings" \ - --subst-var-by "MKFONTDIR" "${xorg.mkfontdir}/bin/mkfontdir" \ - --subst-var-by "MKFONTSCALE" "${xorg.mkfontscale}/bin/mkfontscale" \ + --subst-var-by "ENCODINGSDIR" "${font-encodings}/share/fonts/X11/encodings" \ + --subst-var-by "MKFONTDIR" "${mkfontscale}/bin/mkfontdir" \ + --subst-var-by "MKFONTSCALE" "${mkfontscale}/bin/mkfontscale" \ --subst-var-by "FC_CACHE" "${fontconfig.bin}/bin/fc-cache" \ --subst-var-by "FONTCONFIG_FILE" "$fontsConfPath" ''; diff --git a/pkgs/by-name/xq/xquartz/system-fonts.nix b/pkgs/by-name/xq/xquartz/system-fonts.nix index 6f32a0295725..11621655009d 100644 --- a/pkgs/by-name/xq/xquartz/system-fonts.nix +++ b/pkgs/by-name/xq/xquartz/system-fonts.nix @@ -1,14 +1,16 @@ { stdenv, xorg, + font-alias, + mkfontscale, fontDirs, }: stdenv.mkDerivation { name = "xquartz-system-fonts"; buildInputs = [ - xorg.mkfontdir - xorg.mkfontscale + mkfontscale + mkfontscale ]; buildCommand = '' for i in ${toString fontDirs} ; do @@ -32,6 +34,6 @@ stdenv.mkDerivation { rm -f fonts.dir fonts.scale fonts.alias mkfontdir mkfontscale - cat $( find ${xorg.fontalias}/ -name fonts.alias) >fonts.alias + cat $( find ${font-alias}/ -name fonts.alias) >fonts.alias ''; } diff --git a/pkgs/by-name/xr/xrdp/package.nix b/pkgs/by-name/xr/xrdp/package.nix index db77a0f8e008..9ef8c4f47f23 100644 --- a/pkgs/by-name/xr/xrdp/package.nix +++ b/pkgs/by-name/xr/xrdp/package.nix @@ -18,6 +18,11 @@ libopus, nasm, xorg, + xorg-server, + libxrandr, + libxfixes, + libx11, + xauth, lame, pixman, libjpeg_turbo, @@ -48,7 +53,7 @@ let ]; buildInputs = [ - xorg.xorgserver + xorg-server libdrm ]; @@ -109,13 +114,13 @@ let pam pixman systemd - xorg.libX11 - xorg.libXfixes - xorg.libXrandr + libx11 + libxfixes + libxrandr ]; postPatch = '' - substituteInPlace sesman/sesexec/xauth.c --replace "xauth -q" "${xorg.xauth}/bin/xauth -q" + substituteInPlace sesman/sesexec/xauth.c --replace "xauth -q" "${xauth}/bin/xauth -q" substituteInPlace configure.ac --replace /usr/include/ "" ''; @@ -163,9 +168,9 @@ let cat >> $out/etc/xrdp/sesman.ini <' xtserv.c sed -i '35i#include ' xtbot.c ''; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/by-name/xv/xv/package.nix b/pkgs/by-name/xv/xv/package.nix index a0c78180e6aa..3902d3f52657 100644 --- a/pkgs/by-name/xv/xv/package.nix +++ b/pkgs/by-name/xv/xv/package.nix @@ -3,7 +3,8 @@ stdenv, fetchFromGitHub, cmake, - xorg, + libxt, + libx11, libpng, libwebp, libtiff, @@ -26,8 +27,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - xorg.libX11 - xorg.libXt + libx11 + libxt libpng libwebp libtiff diff --git a/pkgs/by-name/xw/xwayland-run/package.nix b/pkgs/by-name/xw/xwayland-run/package.nix index 7b3d1e4d3f12..8bd914fe0ced 100644 --- a/pkgs/by-name/xw/xwayland-run/package.nix +++ b/pkgs/by-name/xw/xwayland-run/package.nix @@ -5,7 +5,7 @@ ninja, python3, weston, - xorg, + xauth, xwayland, withCage ? false, cage, @@ -56,7 +56,7 @@ python3.pkgs.buildPythonApplication rec { --prefix PATH : ${ lib.makeBinPath [ xwayland - xorg.xauth + xauth ] } wrapProgram $out/bin/xwfb-run \ @@ -65,7 +65,7 @@ python3.pkgs.buildPythonApplication rec { compositors ++ [ xwayland - xorg.xauth + xauth ] ) } diff --git a/pkgs/by-name/xw/xwinwrap/package.nix b/pkgs/by-name/xw/xwinwrap/package.nix index 5ba8a90abd50..39e56baeaab9 100644 --- a/pkgs/by-name/xw/xwinwrap/package.nix +++ b/pkgs/by-name/xw/xwinwrap/package.nix @@ -2,7 +2,9 @@ lib, stdenv, fetchbzr, - xorg, + libxrender, + libxext, + libx11, }: stdenv.mkDerivation rec { @@ -16,9 +18,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ - xorg.libX11 - xorg.libXext - xorg.libXrender + libx11 + libxext + libxrender ]; buildPhase = diff --git a/pkgs/by-name/yd/ydotool/package.nix b/pkgs/by-name/yd/ydotool/package.nix index bcbe83b73bca..dfa24842a6da 100644 --- a/pkgs/by-name/yd/ydotool/package.nix +++ b/pkgs/by-name/yd/ydotool/package.nix @@ -6,7 +6,7 @@ cmake, scdoc, util-linux, - xorg, + xinput, nixosTests, }: @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace Daemon/ydotoold.c \ - --replace "/usr/bin/xinput" "${xorg.xinput}/bin/xinput" + --replace "/usr/bin/xinput" "${xinput}/bin/xinput" substituteInPlace Daemon/ydotool.service.in \ --replace "/usr/bin/kill" "${util-linux}/bin/kill" ''; diff --git a/pkgs/by-name/yo/yoshimi/package.nix b/pkgs/by-name/yo/yoshimi/package.nix index 454f52d306b8..902e3f3b75c5 100644 --- a/pkgs/by-name/yo/yoshimi/package.nix +++ b/pkgs/by-name/yo/yoshimi/package.nix @@ -17,7 +17,7 @@ pcre, pkg-config, readline, - xorg, + libpthread-stubs, zlib, }: @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { minixml pcre readline - xorg.libpthreadstubs + libpthread-stubs zlib ]; diff --git a/pkgs/by-name/yo/youtube-tui/package.nix b/pkgs/by-name/yo/youtube-tui/package.nix index c4508c1cde15..d5010b41531c 100644 --- a/pkgs/by-name/yo/youtube-tui/package.nix +++ b/pkgs/by-name/yo/youtube-tui/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, pkg-config, openssl, - xorg, + libxcb, stdenv, python3, makeBinaryWrapper, @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - xorg.libxcb + libxcb libsixel mpv ]; diff --git a/pkgs/by-name/yu/yudit/package.nix b/pkgs/by-name/yu/yudit/package.nix index e7131c8c54d0..4fb8cbd24ba9 100644 --- a/pkgs/by-name/yu/yudit/package.nix +++ b/pkgs/by-name/yu/yudit/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - xorg, + libx11, }: stdenv.mkDerivation (finalAttrs: { @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ - xorg.libX11 + libx11 ]; meta = { diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 47b5fb2e12c4..30ac3ab02187 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -19,7 +19,7 @@ libxkbcommon, wayland, libglvnd, - xorg, + libxcb, stdenv, makeFontsConf, vulkan-loader, @@ -170,7 +170,7 @@ rustPlatform.buildRustPackage (finalAttrs: { alsa-lib libxkbcommon wayland - xorg.libxcb + libxcb # required by livekit: libGL libX11 diff --git a/pkgs/by-name/ze/zepp-simulator/package.nix b/pkgs/by-name/ze/zepp-simulator/package.nix index 3c814ba95562..6e565b6c33dc 100644 --- a/pkgs/by-name/ze/zepp-simulator/package.nix +++ b/pkgs/by-name/ze/zepp-simulator/package.nix @@ -21,7 +21,7 @@ libepoxy, libpng, libaio, - xorg, + libx11, libvterm, vte, gsasl, @@ -86,7 +86,7 @@ stdenv.mkDerivation { libepoxy libpng libaio - xorg.libX11 + libx11 libvterm vte gsasl diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 433fd2acb869..802f7d5a1751 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -196,21 +196,21 @@ let pkgs.udev pkgs.util-linux pkgs.wayland - pkgs.xorg.libX11 - pkgs.xorg.libXcomposite - pkgs.xorg.libXdamage - pkgs.xorg.libXext - pkgs.xorg.libXfixes - pkgs.xorg.libXrandr - pkgs.xorg.libXrender - pkgs.xorg.libXtst - pkgs.xorg.libxcb - pkgs.xorg.libxshmfence - pkgs.xorg.xcbutilcursor - pkgs.xorg.xcbutilimage - pkgs.xorg.xcbutilkeysyms - pkgs.xorg.xcbutilrenderutil - pkgs.xorg.xcbutilwm + pkgs.libx11 + pkgs.libxcomposite + pkgs.libxdamage + pkgs.libxext + pkgs.libxfixes + pkgs.libxrandr + pkgs.libxrender + pkgs.libxtst + pkgs.libxcb + pkgs.libxshmfence + pkgs.libxcb-cursor + pkgs.libxcb-image + pkgs.libxcb-keysyms + pkgs.libxcb-render-util + pkgs.libxcb-wm pkgs.zlib ] ++ lib.optionals pulseaudioSupport [ diff --git a/pkgs/by-name/zo/zoom-us/test.nix b/pkgs/by-name/zo/zoom-us/test.nix index ecfc2170f91c..57cc2047312f 100644 --- a/pkgs/by-name/zo/zoom-us/test.nix +++ b/pkgs/by-name/zo/zoom-us/test.nix @@ -4,14 +4,14 @@ zoom-us, runCommand, writeShellApplication, - xorg, + xwininfo, }: let testScript = writeShellApplication { name = "zoom-us-test-script"; runtimeInputs = [ - xorg.xwininfo + xwininfo zoom-us ]; text = '' diff --git a/pkgs/by-name/zo/zoom/package.nix b/pkgs/by-name/zo/zoom/package.nix index 4f1c9f4cc498..156e8444665a 100644 --- a/pkgs/by-name/zo/zoom/package.nix +++ b/pkgs/by-name/zo/zoom/package.nix @@ -7,6 +7,11 @@ fontconfig, freetype, xorg, + libxrender, + libxext, + libx11, + libsm, + libice, }: # !!! assert freetype == xorg.freetype @@ -25,11 +30,11 @@ stdenv.mkDerivation rec { expat fontconfig freetype - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXext - xorg.libXrender + libice + libsm + libx11 + libxext + libxrender ]; env.NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2 -fgnu89-inline"; diff --git a/pkgs/by-name/zo/zotero-beta/package.nix b/pkgs/by-name/zo/zotero-beta/package.nix index 321c9521450b..fd2fadf23788 100644 --- a/pkgs/by-name/zo/zotero-beta/package.nix +++ b/pkgs/by-name/zo/zotero-beta/package.nix @@ -12,7 +12,16 @@ glib, gtk3, libGL, - xorg, + libxtst, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, libgbm, pango, pciutils, @@ -44,16 +53,16 @@ stdenv.mkDerivation rec { glib gtk3 libGL - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXtst - xorg.libxcb + libx11 + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxtst + libxcb libgbm pango pciutils diff --git a/pkgs/by-name/zo/zotero/linux.nix b/pkgs/by-name/zo/zotero/linux.nix index 9b7368510194..ce80634d8e71 100644 --- a/pkgs/by-name/zo/zotero/linux.nix +++ b/pkgs/by-name/zo/zotero/linux.nix @@ -15,7 +15,16 @@ gtk3, libGL, libva, - xorg, + libxtst, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, libgbm, pango, pciutils, @@ -51,16 +60,16 @@ stdenv.mkDerivation rec { gtk3 libGL libva - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXtst - xorg.libxcb + libx11 + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxtst + libxcb libgbm pango pciutils diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index af90b8dd0e41..aa80c27297ad 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -8,7 +8,7 @@ qtbase, qtwayland, qt5, - xorg, + libxcb, useQt6 ? false, }: @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { qtbase ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - xorg.libxcb + libxcb ] ++ lib.optionals (!useQt6) [ qt5.qtx11extras diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index ae8d23c92e1f..881a374ff21a 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -53,7 +53,20 @@ wayland-protocols, wayland-scanner, writeText, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + xorgproto, + libxcb, zlib, directoryListingUpdater, }: @@ -97,9 +110,9 @@ stdenv.mkDerivation rec { systemd udev wayland-protocols - xorg.libX11 - xorg.libXcursor - xorg.xorgproto + libx11 + libxcursor + xorgproto zlib # still missing parent icon themes: RAVE-X, Faenza ]; @@ -133,17 +146,17 @@ stdenv.mkDerivation rec { poppler util-linux wayland - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXinerama - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb + libxscrnsaver + libxcomposite + libxdamage + libxext + libxfixes + libxi + libxinerama + libxrandr + libxrender + libxtst + libxcb ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 3c05aba8f87b..e37414a46b9a 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -14,7 +14,8 @@ libGLU, libGL, pango, - xorg, + libxmu, + libx11, }: stdenv.mkDerivation { @@ -47,8 +48,8 @@ stdenv.mkDerivation { libGLU libGL pango - xorg.libX11 - xorg.libXmu + libx11 + libxmu ]; preConfigure = '' diff --git a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix index 499ce79a8ac9..8571b0ac462b 100644 --- a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix @@ -5,7 +5,8 @@ replaceVars, glib, gettext, - xorg, + xwininfo, + xprop, }: stdenv.mkDerivation rec { @@ -26,8 +27,8 @@ stdenv.mkDerivation rec { patches = [ (replaceVars ./fix-paths.patch { - xprop = "${xorg.xprop}/bin/xprop"; - xwininfo = "${xorg.xwininfo}/bin/xwininfo"; + xprop = "${xprop}/bin/xprop"; + xwininfo = "${xwininfo}/bin/xwininfo"; }) ]; diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index 03bae0e92b59..c237e67668ed 100644 --- a/pkgs/desktops/lumina/lumina/default.nix +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -12,7 +12,11 @@ qtsvg, qttools, qtx11extras, - xorg, + libxcb-wm, + libxcb-image, + libxdamage, + libxcursor, + libxcb, xscreensaver, wrapGAppsHook3, }: @@ -43,11 +47,11 @@ mkDerivation rec { qtmultimedia qtsvg qtx11extras - xorg.libXcursor - xorg.libXdamage - xorg.libxcb - xorg.xcbutilimage - xorg.xcbutilwm + libxcursor + libxdamage + libxcb + libxcb-image + libxcb-wm xscreensaver ]; diff --git a/pkgs/desktops/mate/caja/with-extensions.nix b/pkgs/desktops/mate/caja/with-extensions.nix index 6a380e6b377b..30724613c9d3 100644 --- a/pkgs/desktops/mate/caja/with-extensions.nix +++ b/pkgs/desktops/mate/caja/with-extensions.nix @@ -3,7 +3,7 @@ lib, glib, wrapGAppsHook3, - xorg, + lndir, caja, cajaExtensions, extensions ? [ ], @@ -22,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ glib wrapGAppsHook3 - xorg.lndir + lndir ]; buildInputs = diff --git a/pkgs/desktops/mate/mate-panel/with-applets.nix b/pkgs/desktops/mate/mate-panel/with-applets.nix index 9e81c5715ee6..b63e6d7a886b 100644 --- a/pkgs/desktops/mate/mate-panel/with-applets.nix +++ b/pkgs/desktops/mate/mate-panel/with-applets.nix @@ -3,7 +3,7 @@ lib, glib, wrapGAppsHook3, - xorg, + lndir, marco, mate-panel, panelApplets, @@ -51,7 +51,7 @@ stdenv.mkDerivation { mkdir -p $out for i in $(cat $pathsPath); do - ${xorg.lndir}/bin/lndir -silent $i $out + ${lndir}/bin/lndir -silent $i $out done runHook postInstall diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix index 277c91bbe7c5..27587ee2caf5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix @@ -16,7 +16,8 @@ libgudev, libwacom, switchboard, - xorg, + libxi, + libx11, }: stdenv.mkDerivation rec { @@ -47,8 +48,8 @@ stdenv.mkDerivation rec { libgudev libwacom switchboard - xorg.libX11 - xorg.libXi + libx11 + libxi ]; passthru = { diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index 309d40b029af..b4f06ce9cfa3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -3,7 +3,7 @@ glib, lib, stdenv, - xorg, + lndir, switchboard, switchboardPlugs, plugs, @@ -51,7 +51,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out for i in $(cat $pathsPath); do - ${xorg.lndir}/bin/lndir -silent $i $out + ${lndir}/bin/lndir -silent $i $out done dbus_file="share/dbus-1/services/io.elementary.settings.service" diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index d6d778900eb3..2f1604a628d3 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -13,7 +13,7 @@ libxml2, wingpanel, libgee, - xorg, + xkeyboard-config, libgnomekbd, ibus, }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ibus libgee wingpanel - xorg.xkeyboardconfig + xkeyboard-config ]; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix index 73f21f000920..cb089c3cd0c5 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix @@ -3,7 +3,7 @@ wrapGAppsHook3, glib, stdenv, - xorg, + lndir, wingpanel, wingpanelIndicators, switchboard-with-plugs, @@ -49,7 +49,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out for i in $(cat $pathsPath); do - ${xorg.lndir}/bin/lndir -silent $i $out + ${lndir}/bin/lndir -silent $i $out done ''; diff --git a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix index e3428ab4db01..a5ebe0633133 100644 --- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix +++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix @@ -14,7 +14,7 @@ gtk4, pantheon-wayland, systemd, - xorg, + libx11, }: stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { gtk4 pantheon-wayland systemd - xorg.libX11 + libx11 ]; mesonFlags = [ diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 44e306b83f41..4e0c60b91527 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -71,7 +71,7 @@ in }; ezxdisp = old: - (addToBuildInputsWithPkgConfig pkgs.xorg.libX11 old) + (addToBuildInputsWithPkgConfig pkgs.libx11 old) // { env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-function-declaration" @@ -193,7 +193,7 @@ in ); uuid-lib = addToBuildInputs pkgs.libuuid; ws-client = addToBuildInputs pkgs.zlib; - xlib = addToPropagatedBuildInputs pkgs.xorg.libX11; + xlib = addToPropagatedBuildInputs pkgs.libx11; yaml = addToBuildInputs pkgs.libyaml; zlib = addToBuildInputs pkgs.zlib; zmq = addToBuildInputs pkgs.zeromq; diff --git a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix index c26fa0a73d2d..a425f8fce636 100644 --- a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix +++ b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix @@ -6,7 +6,7 @@ { lib, runCommand, - xorg, + lndir, cacert, unzip, @@ -44,7 +44,7 @@ in runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}" { nativeBuildInputs = [ - xorg.lndir + lndir flutter' unzip ]; diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix index 36b2e538bf46..41cf9a49fb72 100644 --- a/pkgs/development/compilers/flutter/engine/package.nix +++ b/pkgs/development/compilers/flutter/engine/package.nix @@ -19,7 +19,18 @@ patchelf, gn, openbox, - xorg, + xorg-server, + libxxf86vm, + libxrender, + libxrandr, + libxi, + libxinerama, + libxfixes, + libxext, + libxcursor, + libx11, + xorgproto, + libxcb, libglvnd, libepoxy, wayland, @@ -114,17 +125,17 @@ stdenv.mkDerivation (finalAttrs: { harfbuzz pango cairo - xorg.libxcb - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXrender - xorg.libXinerama - xorg.libXi - xorg.libXext - xorg.libXfixes - xorg.libXxf86vm - xorg.xorgproto + libxcb + libx11 + libxcursor + libxrandr + libxrender + libxinerama + libxi + libxext + libxfixes + libxxf86vm + xorgproto zlib ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ @@ -156,7 +167,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!isOptimized) "-U_FORTIFY_SOURCE"; nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ - xorg.xorgserver + xorg-server openbox ]; diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index eb1d3d5410ee..3f6cd0287634 100644 --- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix @@ -14,7 +14,11 @@ runCommandCC, setJavaClassPath, unzip, - xorg, + libxtst, + libxrender, + libxi, + libxext, + libx11, zlib, # extra params extraCLibs ? [ ], @@ -128,11 +132,11 @@ let alsa-lib # libasound.so wanted by lib/libjsound.so fontconfig (lib.getLib stdenv.cc.cc) # libstdc++.so.6 - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst + libx11 + libxext + libxi + libxrender + libxtst ]; postInstall = diff --git a/pkgs/development/compilers/opensmalltalk-vm/default.nix b/pkgs/development/compilers/opensmalltalk-vm/default.nix index f0cff1818e0e..e65b74b6cc5b 100644 --- a/pkgs/development/compilers/opensmalltalk-vm/default.nix +++ b/pkgs/development/compilers/opensmalltalk-vm/default.nix @@ -15,7 +15,8 @@ openssl, pango, pkg-config, - xorg, + libxrandr, + libx11, }: let buildVM = @@ -91,8 +92,8 @@ let libuuid openssl pango - xorg.libX11 - xorg.libXrandr + libx11 + libxrandr ]; postInstall = '' diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 30715cfaffd6..201cd7c7bbf2 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -23,7 +23,7 @@ libuuid, openssl, pango, - xorg, + libx11, squeakImageHash ? null, squeakSourcesHash ? null, squeakSourcesVersion ? null, @@ -124,7 +124,7 @@ stdenv.mkDerivation { libuuid openssl pango - xorg.libX11 + libx11 ]; postUnpack = '' diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix index f9e78dc80a01..8fe6a9f59b3a 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -17,7 +17,11 @@ fontconfig, freetype, libffi, - xorg, + libxtst, + libxrender, + libxi, + libxext, + libx11, zlib, # runtime dependencies cups, @@ -63,11 +67,11 @@ let fontconfig freetype (lib.getLib stdenv.cc.cc) # libstdc++.so.6 - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst + libx11 + libxext + libxi + libxrender + libxtst zlib ] ++ lib.optional stdenv.hostPlatform.isAarch32 libffi; diff --git a/pkgs/development/compilers/zulu/common.nix b/pkgs/development/compilers/zulu/common.nix index c5e99ae91acc..11ba01f75b58 100644 --- a/pkgs/development/compilers/zulu/common.nix +++ b/pkgs/development/compilers/zulu/common.nix @@ -14,7 +14,12 @@ fontconfig, freetype, zlib, - xorg, + libxxf86vm, + libxtst, + libxrender, + libxi, + libxext, + libx11, # runtime dependencies cups, # runtime dependencies for GTK+ Look and Feel @@ -96,12 +101,12 @@ let fontconfig freetype stdenv.cc.cc # libstdc++.so.6 - xorg.libX11 - xorg.libXext - xorg.libXi - xorg.libXrender - xorg.libXtst - xorg.libXxf86vm + libx11 + libxext + libxi + libxrender + libxtst + libxxf86vm zlib ] ++ lib.optionals (stdenv.hostPlatform.isLinux && enableJavaFX) runtimeDependencies; diff --git a/pkgs/development/cuda-modules/packages/nsight_systems.nix b/pkgs/development/cuda-modules/packages/nsight_systems.nix index f043d5887e51..895fd5853341 100644 --- a/pkgs/development/cuda-modules/packages/nsight_systems.nix +++ b/pkgs/development/cuda-modules/packages/nsight_systems.nix @@ -14,7 +14,10 @@ rdma-core, ucx, wayland, - xorg, + libxtst, + libxrandr, + libxdamage, + libxcursor, }: let # NOTE(@connorbaker): nsight_systems doesn't support Jetson, so no need for case splitting on aarch64-linux. @@ -119,10 +122,10 @@ buildRedist ( rdma-core ucx wayland - xorg.libXcursor - xorg.libXdamage - xorg.libXrandr - xorg.libXtst + libxcursor + libxdamage + libxrandr + libxtst ] # NOTE(@connorbaker): Seems to be required only for aarch64-linux. ++ lib.optionals (backendStdenv.hostPlatform.isAarch64 && cudaAtLeast "11.8") [ diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix index 0d1b3509555f..56054899cba4 100644 --- a/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -19,7 +19,12 @@ # Packages needed for Teensyduino upx, fontconfig, - xorg, + libxxf86vm, + libxinerama, + libxft, + libxext, + libx11, + libsm, gcc, atk, glib, @@ -74,12 +79,12 @@ let libusb-compat-0_1 pango udev - xorg.libSM - xorg.libX11 - xorg.libXext - xorg.libXft - xorg.libXinerama - xorg.libXxf86vm + libsm + libx11 + libxext + libxft + libxinerama + libxxf86vm zlib ]; teensy_architecture = diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index b4f120e45dcb..dd5dcb261703 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -577,9 +577,9 @@ builtins.intersectAttrs super { testDepends = drv.testDepends or [ ] ++ map lib.getBin [ - pkgs.xorg.xorgserver - pkgs.xorg.xprop - pkgs.xorg.xrandr + pkgs.xorg-server + pkgs.xprop + pkgs.xrandr pkgs.xdummy pkgs.xterm pkgs.dbus @@ -710,7 +710,7 @@ builtins.intersectAttrs super { pcap = addExtraLibrary pkgs.libpcap super.pcap; # https://github.com/NixOS/nixpkgs/issues/53336 - greenclip = addExtraLibrary pkgs.xorg.libXdmcp super.greenclip; + greenclip = addExtraLibrary pkgs.libxdmcp super.greenclip; # The cabal files for these libraries do not list the required system dependencies. libjwt-typed = addExtraLibrary pkgs.libjwt super.libjwt-typed; @@ -1982,13 +1982,13 @@ builtins.intersectAttrs super { ; webkit2gtk3-javascriptcore = lib.pipe super.webkit2gtk3-javascriptcore [ - (addBuildDepend pkgs.xorg.libXtst) + (addBuildDepend pkgs.libxtst) (addBuildDepend pkgs.lerc) (overrideCabal { __onlyPropagateKnownPkgConfigModules = true; }) ]; gi-webkit2 = lib.pipe super.gi-webkit2 [ - (addBuildDepend pkgs.xorg.libXtst) + (addBuildDepend pkgs.libxtst) (addBuildDepend pkgs.lerc) (overrideCabal { __onlyPropagateKnownPkgConfigModules = true; }) ]; diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 1ab41c655cad..5d6b0f3eb699 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -41,7 +41,7 @@ unixODBC, wrapGAppsHook3, wxGTK32, - xorg, + libx11, zlib, }: let @@ -59,7 +59,7 @@ let libGL libGLU wxGTK32 - xorg.libX11 + libx11 wrapGAppsHook3 ]; diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index ef0ba19d8071..fe0375b5e35c 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -19,7 +19,7 @@ autoconf, automake, libtool, - xorg, + libx11, }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ SDL2 - xorg.libX11 # SDl2 optional depend, for SDL_syswm.h + libx11 # SDl2 optional depend, for SDL_syswm.h libGLU libGL openal diff --git a/pkgs/development/interpreters/love/11.nix b/pkgs/development/interpreters/love/11.nix index e3ea4d9a6656..2fe0d4bedc31 100644 --- a/pkgs/development/interpreters/love/11.nix +++ b/pkgs/development/interpreters/love/11.nix @@ -18,7 +18,7 @@ libtheora, which, libtool, - xorg, + libx11, cmake, }: @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { libtool ] ++ lib.optionals stdenv.isLinux [ - xorg.libX11 # SDL2 optional depend, for SDL_syswm.h + libx11 # SDL2 optional depend, for SDL_syswm.h libGLU libGL ]; diff --git a/pkgs/development/interpreters/python/conda/default.nix b/pkgs/development/interpreters/python/conda/default.nix index ceb2cad30a71..a9c466b39ed2 100644 --- a/pkgs/development/interpreters/python/conda/default.nix +++ b/pkgs/development/interpreters/python/conda/default.nix @@ -11,18 +11,18 @@ cups gcc-unwrapped libGL - xorg.libSM - xorg.libICE - xorg.libX11 - xorg.libXau - xorg.libXdamage - xorg.libXi - xorg.libXrender - xorg.libXrandr - xorg.libXcomposite - xorg.libXcursor - xorg.libXtst - xorg.libXScrnSaver + libsm + libice + libx11 + libxau + libxdamage + libxi + libxrender + libxrandr + libxcomposite + libxcursor + libxtst + libxscrnsaver ] ); } diff --git a/pkgs/development/interpreters/python/manylinux/default.nix b/pkgs/development/interpreters/python/manylinux/default.nix index 4b7110bab413..4b31ae915d17 100644 --- a/pkgs/development/interpreters/python/manylinux/default.nix +++ b/pkgs/development/interpreters/python/manylinux/default.nix @@ -54,11 +54,11 @@ let "libutil.so.1" = glibc; "libpthread.so.0" = glibc; "libresolv.so.2" = glibc; - "libX11.so.6" = xorg.libX11; - "libXext.so.6" = xorg.libXext; - "libXrender.so.1" = xorg.libXrender; - "libICE.so.6" = xorg.libICE; - "libSM.so.6" = xorg.libSM; + "libX11.so.6" = libx11; + "libXext.so.6" = libxext; + "libXrender.so.1" = libxrender; + "libICE.so.6" = libice; + "libSM.so.6" = libsm; "libGL.so.1" = libGL; "libgobject-2.0.so.0" = glib; "libgthread-2.0.so.0" = glib; diff --git a/pkgs/development/libraries/gobject-introspection/wrapper.nix b/pkgs/development/libraries/gobject-introspection/wrapper.nix index 67ad4ff31d6a..0327e2ee36f8 100644 --- a/pkgs/development/libraries/gobject-introspection/wrapper.nix +++ b/pkgs/development/libraries/gobject-introspection/wrapper.nix @@ -50,7 +50,7 @@ then eval fixupPhase ${lib.concatMapStrings (output: '' mkdir -p ${"$" + "${output}"} - ${lib.getExe buildPackages.xorg.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"} + ${lib.getExe buildPackages.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"} '') overriddenUnwrappedGir.outputs} cp $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped @@ -109,7 +109,7 @@ else eval fixupPhase ${lib.concatMapStrings (output: '' mkdir -p ${"$" + "${output}"} - ${lib.getExe buildPackages.xorg.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"} + ${lib.getExe buildPackages.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"} '') overriddenUnwrappedGir.outputs} ''; }) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 1089c7e8a9cc..3087cff50443 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -47,7 +47,11 @@ enableJack ? true, libjack2, enableX11 ? stdenv.hostPlatform.isLinux, - xorg, + libxtst, + libxi, + libxfixes, + libxext, + libxdamage, ncurses, enableWayland ? stdenv.hostPlatform.isLinux, wayland, @@ -158,11 +162,11 @@ stdenv.mkDerivation (finalAttrs: { libraspberrypi ] ++ lib.optionals enableX11 [ - xorg.libXext - xorg.libXfixes - xorg.libXdamage - xorg.libXtst - xorg.libXi + libxext + libxfixes + libxdamage + libxtst + libxi ] ++ lib.optionals gtkSupport [ # for gtksink diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 4f19e307addd..284cdee16455 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -13,7 +13,13 @@ wayland-scanner, libdrm, udev, - xorg, + libxv, + libxrandr, + libxext, + libx11, + libsm, + libice, + libxcb, libGLU, libGL, gstreamer, @@ -63,13 +69,13 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols libdrm udev - xorg.libX11 - xorg.libxcb - xorg.libXext - xorg.libXv - xorg.libXrandr - xorg.libSM - xorg.libICE + libx11 + libxcb + libxext + libxv + libxrandr + libsm + libice nasm libvpx ] diff --git a/pkgs/development/libraries/intel-oneapi/base.nix b/pkgs/development/libraries/intel-oneapi/base.nix index c110ab2331e6..45f2292f9bfd 100644 --- a/pkgs/development/libraries/intel-oneapi/base.nix +++ b/pkgs/development/libraries/intel-oneapi/base.nix @@ -10,7 +10,14 @@ pkg-config, libdrm, elfutils, - xorg, + libxxf86vm, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxcb, glib, nss, nspr, @@ -86,14 +93,14 @@ intel-oneapi.mkIntelOneApi (finalAttrs: { fontconfig glib freetype - xorg.libX11 - xorg.libXxf86vm - xorg.libXext - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXfixes - xorg.libXrandr + libx11 + libxxf86vm + libxext + libxcb + libxcomposite + libxdamage + libxfixes + libxrandr nss dbus cups @@ -134,13 +141,13 @@ intel-oneapi.mkIntelOneApi (finalAttrs: { libdrm elfutils zlib - xorg.libX11 - xorg.libXext - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXfixes - xorg.libXrandr + libx11 + libxext + libxcb + libxcomposite + libxdamage + libxfixes + libxrandr glib nss dbus diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix index eb2967931480..50d2b42978f7 100644 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix @@ -34,7 +34,7 @@ qtsvg, qttools, qtx11extras, - xorg, + libsm, }: mkDerivation { @@ -61,7 +61,7 @@ mkDerivation { networkmanager qtsvg qtx11extras - xorg.libSM + libsm ]; propagatedBuildInputs = [ kauth diff --git a/pkgs/development/libraries/libwnck/2.nix b/pkgs/development/libraries/libwnck/2.nix index 5a15b05cee6a..73d79128de05 100644 --- a/pkgs/development/libraries/libwnck/2.nix +++ b/pkgs/development/libraries/libwnck/2.nix @@ -5,7 +5,8 @@ pkg-config, gtk2, intltool, - xorg, + libxres, + libx11, }: stdenv.mkDerivation rec { @@ -30,8 +31,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gtk2 - xorg.libX11 - xorg.libXres + libx11 + libxres ]; # ?another optional: startup-notification diff --git a/pkgs/development/libraries/mesa/darwin.nix b/pkgs/development/libraries/mesa/darwin.nix index ae83293ff650..83f3e16bf4ad 100644 --- a/pkgs/development/libraries/mesa/darwin.nix +++ b/pkgs/development/libraries/mesa/darwin.nix @@ -11,7 +11,10 @@ ninja, pkg-config, python3Packages, - xorg, + libxfixes, + libxext, + libx11, + libxcb, zlib, }: let @@ -45,10 +48,10 @@ stdenv.mkDerivation { buildInputs = [ libxml2 # should be propagated from libllvm llvmPackages.libllvm - xorg.libX11 - xorg.libXext - xorg.libXfixes - xorg.libxcb + libx11 + libxext + libxfixes + libxcb zlib ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 30ca20e7e25c..9bab63c9a711 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -39,7 +39,14 @@ wayland-protocols, wayland-scanner, xcbutilkeysyms, - xorg, + libxxf86vm, + libxrandr, + libxfixes, + libxext, + libx11, + xorgproto, + libxshmfence, + libxcb, zstd, enablePatentEncumberedCodecs ? true, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light, @@ -266,13 +273,13 @@ stdenv.mkDerivation { libpng libunwind libva-minimal - xorg.libX11 - xorg.libxcb - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxshmfence - xorg.libXxf86vm + libx11 + libxcb + libxext + libxfixes + libxrandr + libxshmfence + libxxf86vm llvmPackages.clang llvmPackages.clang-unwrapped llvmPackages.libclc @@ -285,7 +292,7 @@ stdenv.mkDerivation { wayland wayland-protocols xcbutilkeysyms - xorg.xorgproto + xorgproto zstd ] ++ lib.optionals withValgrind [ diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index d9b0ef5e7d90..46b954d74d8c 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -57,7 +57,9 @@ roc-toolkit, x11Support ? true, libcanberra, - xorg, + libxfixes, + libx11, + libxcb, libmysofa, ffadoSupport ? x11Support @@ -166,9 +168,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals x11Support [ libcanberra - xorg.libX11 - xorg.libxcb - xorg.libXfixes + libx11 + libxcb + libxfixes ] ++ lib.optionals bluezSupport [ bluez diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 37252077c6df..61aac879b93f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -20,7 +20,11 @@ pkgsBuildTarget, pkgsBuildBuild, - xorg, + libxdamage, + libxcomposite, + xrandr, + libxkbfile, + libpciaccess, libXcursor, libXScrnSaver, libXrandr, @@ -377,16 +381,16 @@ qtModule ( pciutils # X11 libs - xorg.xrandr + xrandr libXScrnSaver libXcursor libXrandr - xorg.libpciaccess + libpciaccess libXtst - xorg.libXcomposite - xorg.libXdamage + libxcomposite + libxdamage libdrm - xorg.libxkbfile + libxkbfile ] ++ lib.optionals pipewireSupport [ diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index eb0564226cbf..cdbe8f0740d1 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -13,7 +13,9 @@ cmake, ninja, libproxy, - xorg, + libxcb-cursor, + libxtst, + libxdmcp, zstd, double-conversion, util-linux, @@ -156,9 +158,9 @@ stdenv.mkDerivation rec { xcbutilkeysyms xcbutilrenderutil xcbutilwm - xorg.libXdmcp - xorg.libXtst - xorg.xcbutilcursor + libxdmcp + libxtst + libxcb-cursor libepoxy ] ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix index 9f2271ceace4..659812c57b63 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix @@ -15,7 +15,12 @@ python3, which, nodejs, - xorg, + libxext, + libxdamage, + libxcomposite, + xrandr, + libxkbfile, + libpciaccess, libXcursor, libXScrnSaver, libXrandr, @@ -254,19 +259,19 @@ qtModule { pciutils # X11 libs - xorg.xrandr + xrandr libXScrnSaver libXcursor libXrandr - xorg.libpciaccess + libpciaccess libXtst - xorg.libXcomposite - xorg.libXdamage + libxcomposite + libxdamage libdrm - xorg.libxkbfile + libxkbfile libxshmfence libXi - xorg.libXext + libxext # Pipewire pipewire diff --git a/pkgs/development/libraries/qwlroots/default.nix b/pkgs/development/libraries/qwlroots/default.nix index eab87539f1d9..49a105281e05 100644 --- a/pkgs/development/libraries/qwlroots/default.nix +++ b/pkgs/development/libraries/qwlroots/default.nix @@ -14,7 +14,8 @@ libgbm, vulkan-loader, libinput, - xorg, + libxcb-errors, + libxdmcp, seatd, wlroots, }: @@ -45,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: { libgbm vulkan-loader libinput - xorg.libXdmcp - xorg.xcbutilerrors + libxdmcp + libxcb-errors seatd ]; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 2b5b24356104..5178cae8a87f 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -22,7 +22,7 @@ wayland-scanner, libwebp, enchant, - xorg, + libx11, libxkbcommon, libavif, libepoxy, @@ -186,7 +186,7 @@ clangStdenv.mkDerivation (finalAttrs: { libseccomp libmanette wayland - xorg.libX11 + libx11 ] ++ lib.optionals systemdSupport [ systemdLibs diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index a68aec6d590b..93bf068e47cf 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -15,7 +15,11 @@ pixman, libcap, libgbm, - xorg, + libxcb-wm, + libxcb-render-util, + libxcb-image, + libxcb-errors, + libx11, hwdata, seatd, vulkan-loader, @@ -88,11 +92,11 @@ let vulkan-loader wayland wayland-protocols - xorg.libX11 - xorg.xcbutilerrors - xorg.xcbutilimage - xorg.xcbutilrenderutil - xorg.xcbutilwm + libx11 + libxcb-errors + libxcb-image + libxcb-render-util + libxcb-wm ] ++ lib.optional finalAttrs.enableXWayland xwayland ++ extraBuildInputs; diff --git a/pkgs/development/misc/msp430/newlib.nix b/pkgs/development/misc/msp430/newlib.nix index 323c26c8d3a7..b7a88a99de17 100644 --- a/pkgs/development/misc/msp430/newlib.nix +++ b/pkgs/development/misc/msp430/newlib.nix @@ -1,6 +1,6 @@ { stdenvNoCC, - xorg, + lndir, newlib, msp430GccSupport, }: @@ -15,9 +15,9 @@ stdenvNoCC.mkDerivation { buildCommand = '' mkdir $out - ${xorg.lndir}/bin/lndir -silent $newlib $out - ${xorg.lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir} - ${xorg.lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir} + ${lndir}/bin/lndir -silent $newlib $out + ${lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir} + ${lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir} ''; passthru = { diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index d2a8cca574fb..154b51d34da4 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -40,20 +40,20 @@ deployAndroidPackage { ] ) ++ (with pkgs; [ - xorg.libX11 - xorg.libXext - xorg.libXdamage - xorg.libXfixes - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXi - xorg.libXrender - xorg.libXtst - xorg.libICE - xorg.libSM - xorg.libxkbfile - xorg.libxshmfence + libx11 + libxext + libxdamage + libxfixes + libxcb + libxcomposite + libxcursor + libxi + libxrender + libxtst + libice + libsm + libxkbfile + libxshmfence ]) ++ lib.optional (os == "linux" && stdenv.isx86_64) pkgsi686Linux.glibc; patchInstructions = @@ -80,7 +80,7 @@ deployAndroidPackage { ] } \ --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \ - --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale + --set QTCOMPOSE ${pkgs.libx11.out}/share/X11/locale '') + '' mkdir -p $out/bin diff --git a/pkgs/development/mobile/androidenv/extras.nix b/pkgs/development/mobile/androidenv/extras.nix index fd98f1f2af84..79acca606d14 100644 --- a/pkgs/development/mobile/androidenv/extras.nix +++ b/pkgs/development/mobile/androidenv/extras.nix @@ -31,8 +31,8 @@ deployAndroidPackage { lib.makeLibraryPath ( with pkgs; [ - xorg.libX11 - xorg.libXrandr + libx11 + libxrandr ] ) } diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix index 4534e52daa4f..f46ffe5b9f0e 100644 --- a/pkgs/development/mobile/androidenv/tools.nix +++ b/pkgs/development/mobile/androidenv/tools.nix @@ -24,17 +24,17 @@ deployAndroidPackage { fontconfig fontconfig.lib stdenv.cc.cc.libgcc or null # fix for https://github.com/NixOS/nixpkgs/issues/226357 - xorg.libX11 - xorg.libXrender - xorg.libXext + libx11 + libxrender + libxext ]) ++ lib.optionals (os == "linux" && stdenv.isx86_64) ( with pkgsi686Linux; [ glibc - xorg.libX11 - xorg.libXrender - xorg.libXext + libx11 + libxrender + libxext fontconfig.lib freetype zlib @@ -64,8 +64,8 @@ deployAndroidPackage { lib.makeLibraryPath ( with pkgs; [ - xorg.libX11 - xorg.libXtst + libx11 + libxtst ] ) } diff --git a/pkgs/development/python-modules/dragonfly/default.nix b/pkgs/development/python-modules/dragonfly/default.nix index fa672cce0bc4..5ca74c336437 100644 --- a/pkgs/development/python-modules/dragonfly/default.nix +++ b/pkgs/development/python-modules/dragonfly/default.nix @@ -19,7 +19,7 @@ werkzeug, wmctrl, xdotool, - xorg, + xprop, }: buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { --replace-fail 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' substituteInPlace dragonfly/windows/x11_window.py \ --replace-fail 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' \ - --replace-fail 'xprop = "xprop"'${" "}'xprop = "${xorg.xprop}/bin/xprop"' \ + --replace-fail 'xprop = "xprop"'${" "}'xprop = "${xprop}/bin/xprop"' \ --replace-fail 'wmctrl = "wmctrl"'${" "}'wmctrl = "${wmctrl}/bin/wmctrl"' ''; diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index 0ce762382a81..e5992995c23d 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -12,7 +12,8 @@ pytest-timeout, pytest-xvfb, i3, - xorg, + xvfb, + xdpyinfo, }: buildPythonPackage rec { @@ -52,8 +53,8 @@ buildPythonPackage rec { pytest-timeout pytest-xvfb i3 - xorg.xdpyinfo - xorg.xvfb + xdpyinfo + xvfb ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix index 4af6b9bedc73..7acf802dcf86 100644 --- a/pkgs/development/python-modules/libretranslate/default.nix +++ b/pkgs/development/python-modules/libretranslate/default.nix @@ -29,7 +29,7 @@ prometheus-client, polib, python, - xorg, + lndir, }: buildPythonPackage rec { @@ -95,7 +95,7 @@ buildPythonPackage rec { { nativeBuildInputs = [ pkgs.brotli - xorg.lndir + lndir ]; } '' diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix index 4b6c4a548c20..3eea4f44c0fa 100644 --- a/pkgs/development/python-modules/mss/default.nix +++ b/pkgs/development/python-modules/mss/default.nix @@ -9,7 +9,9 @@ hatchling, # native dependencies - xorg, + libxrandr, + libxfixes, + libx11, # tests lsof, @@ -32,9 +34,9 @@ buildPythonPackage rec { patches = lib.optionals stdenv.hostPlatform.isLinux [ (replaceVars ./linux-paths.patch { - x11 = "${xorg.libX11}/lib/libX11.so"; - xfixes = "${xorg.libXfixes}/lib/libXfixes.so"; - xrandr = "${xorg.libXrandr}/lib/libXrandr.so"; + x11 = "${libx11}/lib/libX11.so"; + xfixes = "${libxfixes}/lib/libXfixes.so"; + xrandr = "${libxrandr}/lib/libXrandr.so"; }) ]; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index ef45aadb72cf..eb2acfbc97c9 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -20,7 +20,8 @@ setuptools, tzlocal, wrapGAppsHook3, - xorg, + xset, + setxkbmap, glib, gobject-introspection, }: @@ -64,8 +65,8 @@ buildPythonPackage rec { sed -i -e "s|'i3-nagbar|'${i3}/bin/i3-nagbar|" py3status/modules/pomodoro.py sed -i -e "s|'free|'${procps}/bin/free|" py3status/modules/sysdata.py sed -i -e "s|'sensors|'${lm_sensors}/bin/sensors|" py3status/modules/sysdata.py - sed -i -e "s|'setxkbmap|'${xorg.setxkbmap}/bin/setxkbmap|" py3status/modules/keyboard_layout.py - sed -i -e "s|'xset|'${xorg.xset}/bin/xset|" py3status/modules/keyboard_layout.py + sed -i -e "s|'setxkbmap|'${setxkbmap}/bin/setxkbmap|" py3status/modules/keyboard_layout.py + sed -i -e "s|'xset|'${xset}/bin/xset|" py3status/modules/keyboard_layout.py ''; dontWrapGApps = true; diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 49adf16e0010..67a6d0d4f8ed 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -5,7 +5,7 @@ setuptools, libGLU, libGL, - xorg, + libx11, numpy, }: @@ -24,7 +24,7 @@ buildPythonPackage rec { buildInputs = [ libGLU libGL - xorg.libX11 + libx11 ]; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index f94dfe9ebdfb..e68d088371d8 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -6,7 +6,13 @@ flit-core, libGL, libGLU, - xorg, + libxxf86vm, + libxrender, + libxrandr, + libxi, + libxinerama, + libxext, + libx11, pytestCheckHook, glibc, gtk2-x11, @@ -55,13 +61,13 @@ buildPythonPackage rec { elif name == 'c': path = '${glibc}/lib/libc${ext}.6' elif name == 'X11': - path = '${xorg.libX11}/lib/libX11${ext}' + path = '${libx11}/lib/libX11${ext}' elif name == 'gdk-x11-2.0': path = '${gtk2-x11}/lib/libgdk-x11-2.0${ext}' elif name == 'gdk_pixbuf-2.0': path = '${gdk-pixbuf}/lib/libgdk_pixbuf-2.0${ext}' elif name == 'Xext': - path = '${xorg.libXext}/lib/libXext${ext}' + path = '${libxext}/lib/libXext${ext}' elif name == 'fontconfig': path = '${fontconfig.lib}/lib/libfontconfig${ext}' elif name == 'freetype': @@ -73,15 +79,15 @@ buildPythonPackage rec { elif name == 'pulse': path = '${libpulseaudio}/lib/libpulse${ext}' elif name == 'Xi': - path = '${xorg.libXi}/lib/libXi${ext}' + path = '${libxi}/lib/libXi${ext}' elif name == 'Xinerama': - path = '${xorg.libXinerama}/lib/libXinerama${ext}' + path = '${libxinerama}/lib/libXinerama${ext}' elif name == 'Xrandr': - path = '${lib.getLib xorg.libXrandr}/lib/libXrandr${ext}' + path = '${lib.getLib libxrandr}/lib/libXrandr${ext}' elif name == 'Xrender': - path = '${lib.getLib xorg.libXrender}/lib/libXrender${ext}' + path = '${lib.getLib libxrender}/lib/libXrender${ext}' elif name == 'Xxf86vm': - path = '${xorg.libXxf86vm}/lib/libXxf86vm${ext}' + path = '${libxxf86vm}/lib/libXxf86vm${ext}' elif name == 'harfbuzz': path = '${harfbuzz}/lib/libharfbuzz${ext}' if path is not None: diff --git a/pkgs/development/python-modules/pyvirtualdisplay/default.nix b/pkgs/development/python-modules/pyvirtualdisplay/default.nix index 83a14d52a769..1f76c8690a2a 100644 --- a/pkgs/development/python-modules/pyvirtualdisplay/default.nix +++ b/pkgs/development/python-modules/pyvirtualdisplay/default.nix @@ -4,7 +4,11 @@ buildPythonPackage, fetchPypi, replaceVars, - xorg, + xorg-server, + xvfb, + xmessage, + xdpyinfo, + xauth, # build-system setuptools, @@ -33,8 +37,8 @@ buildPythonPackage rec { patches = lib.optionals stdenv.hostPlatform.isLinux [ (replaceVars ./paths.patch { - xauth = lib.getExe xorg.xauth; - xdpyinfo = lib.getExe xorg.xdpyinfo; + xauth = lib.getExe xauth; + xdpyinfo = lib.getExe xdpyinfo; }) ]; @@ -50,9 +54,9 @@ buildPythonPackage rec { pytest-timeout pytestCheckHook (vncdo.overridePythonAttrs { doCheck = false; }) - xorg.xorgserver - xorg.xmessage - xorg.xvfb + xorg-server + xmessage + xvfb ]; pytestFlags = [ "-v" ]; diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index bdd628a6a0a7..743330ba39a9 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -4,7 +4,9 @@ cffi, fetchPypi, pytestCheckHook, - xorg, + xvfb, + xeyes, + libxcb, }: buildPythonPackage rec { @@ -19,7 +21,7 @@ buildPythonPackage rec { postPatch = '' # Hardcode cairo library path - sed -e 's,ffi\.dlopen(,&"${xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py + sed -e 's,ffi\.dlopen(,&"${libxcb.out}/lib/" + ,' -i xcffib/__init__.py ''; propagatedNativeBuildInputs = [ cffi ]; @@ -28,8 +30,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - xorg.xeyes - xorg.xvfb + xeyes + xvfb ]; preCheck = '' diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index 480cfdb0f68e..73c1ff3eca83 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -6,7 +6,9 @@ six, setuptools, setuptools-scm, - xorg, + libx11, + xvfb, + xauth, mock, pytestCheckHook, util-linux, @@ -28,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ xorg.libX11 ]; + buildInputs = [ libx11 ]; propagatedBuildInputs = [ six ]; @@ -38,8 +40,8 @@ buildPythonPackage rec { pytestCheckHook mock util-linux - xorg.xauth - xorg.xvfb + xauth + xvfb ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix index 0bb68452cbbe..4a11aeb783a4 100644 --- a/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, fetchFromGitHub, setuptools, - xorg, + xvfb, pytestCheckHook, }: @@ -21,11 +21,11 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ xorg.xvfb ]; + dependencies = [ xvfb ]; nativeCheckInputs = [ pytestCheckHook - xorg.xvfb + xvfb ]; meta = { diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 5e54e69137c8..928a6fda8aca 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -470,7 +470,7 @@ let libtiff libjpeg cairo.dev - xorg.libXt.dev + libxt.dev fontconfig.lib ]; Cardinal = [ pkgs.which ]; @@ -495,7 +495,7 @@ let cargo rustc ]; - devEMF = with pkgs; [ xorg.libXft.dev ]; + devEMF = with pkgs; [ libxft.dev ]; DEploid = [ pkgs.zlib.dev ]; DEploid_utils = [ pkgs.zlib.dev ]; diversitree = with pkgs; [ @@ -542,7 +542,7 @@ let ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ expat - xorg.libXdmcp + libxdmcp ]; GeneralizedWendland = [ pkgs.gsl ]; ggiraph = [ pkgs.libpng.dev ]; @@ -604,7 +604,7 @@ let mpfr.dev pkg-config ]; - imager = [ pkgs.xorg.libX11.dev ]; + imager = [ pkgs.libx11.dev ]; imbibe = [ pkgs.zlib.dev ]; image_CannyEdges = with pkgs; [ fftw.dev @@ -943,7 +943,7 @@ let ]; tiff = [ pkgs.libtiff.dev ]; tkrplot = with pkgs; [ - xorg.libX11 + libx11 tk.dev ]; topicmodels = [ pkgs.gsl ]; @@ -1175,7 +1175,7 @@ let rgl = with pkgs; [ libGLU libGL - xorg.libX11.dev + libx11.dev freetype.dev libpng.dev ]; @@ -1317,7 +1317,7 @@ let gridGraphics = [ pkgs.which ]; adimpro = with pkgs; [ which - xorg.xdpyinfo + xdpyinfo ]; tfevents = [ pkgs.protobuf ]; rsvg = [ pkgs.librsvg.dev ]; @@ -1541,7 +1541,7 @@ let ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ expat - xorg.libXdmcp + libxdmcp ]; HilbertVisGUI = [ pkgs.gtkmm2.dev ]; textshaping = with pkgs; [ @@ -2459,7 +2459,7 @@ let }); devEMF = old.devEMF.overrideAttrs (attrs: { - NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft.out}/lib -lXft"; + NIX_CFLAGS_LINK = "-L${pkgs.libxft.out}/lib -lXft"; NIX_LDFLAGS = "-lX11"; }); diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 78885df50405..14bc45594041 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -64,7 +64,9 @@ libossp_uuid, lxc, libpcap, - xorg, + libxtst, + libxdmcp, + libpthread-stubs, gtk3, lerc, buildRubyGem, @@ -180,8 +182,8 @@ in glib libsysprof-capture pcre2 - xorg.libpthreadstubs - xorg.libXdmcp + libpthread-stubs + libxdmcp ]; }; @@ -192,8 +194,8 @@ in expat libsysprof-capture pcre2 - xorg.libpthreadstubs - xorg.libXdmcp + libpthread-stubs + libxdmcp ]; }; @@ -563,9 +565,9 @@ in libsysprof-capture libthai pcre2 - xorg.libpthreadstubs - xorg.libXdmcp - xorg.libXtst + libpthread-stubs + libxdmcp + libxtst libxkbcommon libepoxy ]; @@ -889,8 +891,8 @@ in harfbuzz libsysprof-capture pcre2 - xorg.libpthreadstubs - xorg.libXdmcp + libpthread-stubs + libxdmcp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libselinux diff --git a/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix b/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix index 1212bc56d845..9eca47fedb46 100644 --- a/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix +++ b/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix @@ -4,7 +4,7 @@ tcl, tcllib, tk, - xorg, + libx11, }: tcl.mkTclDerivation rec { @@ -24,7 +24,7 @@ tcl.mkTclDerivation rec { ]; buildInputs = [ - xorg.libX11 + libx11 tcllib ]; diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 419d835e24cd..8d94d41c99a6 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -24,7 +24,14 @@ gdk-pixbuf, nss, nspr, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxkbfile, + libxcb, pango, systemd, pciutils, @@ -101,14 +108,14 @@ let gtk4 nss nspr - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxkbfile + libx11 + libxcb + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxkbfile pango pciutils stdenv.cc.cc diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix index b3d1ca7f8cf2..02918284e028 100644 --- a/pkgs/development/tools/electron/chromedriver/generic.nix +++ b/pkgs/development/tools/electron/chromedriver/generic.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, glib, - xorg, + libxcb, nspr, nss, autoPatchelfHook, @@ -65,7 +65,7 @@ let buildInputs = [ (lib.getLib stdenv.cc.cc) glib - xorg.libxcb + libxcb nspr nss ]; diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index fed84d634edc..838488ee21c7 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -34,7 +34,18 @@ stdenv, systemd, udev, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxshmfence, }: let @@ -64,18 +75,18 @@ let nspr nss pango - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxshmfence + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxshmfence # libnw-specific (not chromium dependencies) ffmpeg libxcb diff --git a/pkgs/development/web/playwright/chromium.nix b/pkgs/development/web/playwright/chromium.nix index 3b5d36592461..17458292b824 100644 --- a/pkgs/development/web/playwright/chromium.nix +++ b/pkgs/development/web/playwright/chromium.nix @@ -31,7 +31,13 @@ stdenv, systemd, vulkan-loader, - xorg, + libxrandr, + libxfixes, + libxext, + libxdamage, + libxcomposite, + libx11, + libxcb, ... }: let @@ -80,13 +86,13 @@ let pango stdenv.cc.cc.lib systemd - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxcb + libx11 + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxcb ]; installPhase = '' diff --git a/pkgs/games/fteqw/default.nix b/pkgs/games/fteqw/default.nix index b6e6415e057e..93ad0c86a695 100644 --- a/pkgs/games/fteqw/default.nix +++ b/pkgs/games/fteqw/default.nix @@ -16,7 +16,9 @@ vulkan-headers, speex, libopus, - xorg, + libxscrnsaver, + libxrandr, + libxcursor, libGL, }@attrs: { @@ -44,9 +46,9 @@ vulkan-loader speex libopus - xorg.libXrandr - xorg.libXcursor - xorg.libXScrnSaver + libxrandr + libxcursor + libxscrnsaver ]; postFixup = '' diff --git a/pkgs/games/fteqw/generic.nix b/pkgs/games/fteqw/generic.nix index a64fd05d9121..3646c4871fa0 100644 --- a/pkgs/games/fteqw/generic.nix +++ b/pkgs/games/fteqw/generic.nix @@ -3,7 +3,7 @@ fetchFromGitHub, stdenv, libopus, - xorg, + libxrandr, pname, releaseFile ? pname, buildFlags, @@ -42,7 +42,7 @@ stdenv.mkDerivation { substituteInPlace ./engine/Makefile \ --replace "I/usr/include/opus" "I${libopus.dev}/include/opus" substituteInPlace ./engine/gl/gl_vidlinuxglx.c \ - --replace 'Sys_LoadLibrary("libXrandr"' 'Sys_LoadLibrary("${xorg.libXrandr}/lib/libXrandr.so"' + --replace 'Sys_LoadLibrary("libXrandr"' 'Sys_LoadLibrary("${libxrandr}/lib/libXrandr.so"' ''; installPhase = '' diff --git a/pkgs/games/openloco/default.nix b/pkgs/games/openloco/default.nix index e64c6f6aa978..d0106e40831b 100644 --- a/pkgs/games/openloco/default.nix +++ b/pkgs/games/openloco/default.nix @@ -11,7 +11,7 @@ pkg-config, yaml-cpp, fmt_11, - xorg, + libx11, }: let sfl-src = fetchFromGitHub { @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { openal yaml-cpp fmt_11 - xorg.libX11 + libx11 ]; meta = { diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index b4a4568967aa..852e9a847c68 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -4,7 +4,8 @@ fetchurl, unzip, patchelf, - xorg, + libxxf86vm, + libxext, openal, }: @@ -27,8 +28,8 @@ let rtdeps = lib.makeLibraryPath [ - xorg.libXxf86vm - xorg.libXext + libxxf86vm + libxext openal ] + ":" diff --git a/pkgs/kde/frameworks/kidletime/default.nix b/pkgs/kde/frameworks/kidletime/default.nix index 1fc517f20585..ccd0b7314aaf 100644 --- a/pkgs/kde/frameworks/kidletime/default.nix +++ b/pkgs/kde/frameworks/kidletime/default.nix @@ -2,7 +2,7 @@ mkKdeDerivation, qtwayland, pkg-config, - xorg, + libxscrnsaver, }: mkKdeDerivation { pname = "kidletime"; @@ -10,6 +10,6 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtwayland - xorg.libXScrnSaver + libxscrnsaver ]; } diff --git a/pkgs/kde/gear/colord-kde/default.nix b/pkgs/kde/gear/colord-kde/default.nix index e2ce75a98e77..93b743413471 100644 --- a/pkgs/kde/gear/colord-kde/default.nix +++ b/pkgs/kde/gear/colord-kde/default.nix @@ -2,7 +2,7 @@ mkKdeDerivation, pkg-config, lcms2, - xorg, + libxrandr, }: mkKdeDerivation { pname = "colord-kde"; @@ -10,7 +10,7 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ lcms2 - xorg.libXrandr + libxrandr ]; meta.mainProgram = "colord-kde-icc-importer"; } diff --git a/pkgs/kde/gear/kio-extras/default.nix b/pkgs/kde/gear/kio-extras/default.nix index 2260feeac62c..70433f128e2e 100644 --- a/pkgs/kde/gear/kio-extras/default.nix +++ b/pkgs/kde/gear/kio-extras/default.nix @@ -13,7 +13,7 @@ taglib, shared-mime-info, libappimage, - xorg, + libxcursor, kio, }: mkKdeDerivation { @@ -37,7 +37,7 @@ mkKdeDerivation { openexr taglib libappimage - xorg.libXcursor + libxcursor ]; postInstall = '' diff --git a/pkgs/kde/gear/kmousetool/default.nix b/pkgs/kde/gear/kmousetool/default.nix index 7eca9ab12c73..3886aa8d9d74 100644 --- a/pkgs/kde/gear/kmousetool/default.nix +++ b/pkgs/kde/gear/kmousetool/default.nix @@ -1,14 +1,14 @@ { mkKdeDerivation, qtmultimedia, - xorg, + libxt, }: mkKdeDerivation { pname = "kmousetool"; extraBuildInputs = [ qtmultimedia - xorg.libXt + libxt ]; meta.mainProgram = "kmousetool"; } diff --git a/pkgs/kde/gear/krfb/default.nix b/pkgs/kde/gear/krfb/default.nix index d2be34808082..a52efeb15511 100644 --- a/pkgs/kde/gear/krfb/default.nix +++ b/pkgs/kde/gear/krfb/default.nix @@ -4,7 +4,7 @@ qtbase, libvncserver, pipewire, - xorg, + libxdamage, }: mkKdeDerivation { pname = "krfb"; @@ -17,6 +17,6 @@ mkKdeDerivation { extraBuildInputs = [ libvncserver pipewire - xorg.libXdamage + libxdamage ]; } diff --git a/pkgs/kde/plasma/kgamma/default.nix b/pkgs/kde/plasma/kgamma/default.nix index 607a04a945ea..98aea358d089 100644 --- a/pkgs/kde/plasma/kgamma/default.nix +++ b/pkgs/kde/plasma/kgamma/default.nix @@ -1,9 +1,9 @@ { mkKdeDerivation, - xorg, + libxxf86vm, }: mkKdeDerivation { pname = "kgamma"; - extraBuildInputs = [ xorg.libXxf86vm ]; + extraBuildInputs = [ libxxf86vm ]; } diff --git a/pkgs/kde/plasma/kwin-x11/default.nix b/pkgs/kde/plasma/kwin-x11/default.nix index 9573bbecb954..b32ccb04f6d5 100644 --- a/pkgs/kde/plasma/kwin-x11/default.nix +++ b/pkgs/kde/plasma/kwin-x11/default.nix @@ -5,7 +5,7 @@ qtsensors, qttools, qtwayland, - xorg, + libxcvt, libcanberra, libdisplay-info, libgbm, @@ -39,6 +39,6 @@ mkKdeDerivation { libcanberra libdisplay-info - xorg.libxcvt + libxcvt ]; } diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix index 8b8244c0fdae..eec3047201da 100644 --- a/pkgs/kde/plasma/kwin/default.nix +++ b/pkgs/kde/plasma/kwin/default.nix @@ -7,7 +7,7 @@ qtvirtualkeyboard, qtwayland, libinput, - xorg, + libxcvt, xwayland, libcanberra, libdisplay-info, @@ -59,7 +59,7 @@ mkKdeDerivation { libinput pipewire - xorg.libxcvt + libxcvt # we need to provide this so it knows our xwayland supports new features xwayland ]; diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix index 4401a99d7a48..30de7c407e2d 100644 --- a/pkgs/kde/plasma/plasma-desktop/default.nix +++ b/pkgs/kde/plasma/plasma-desktop/default.nix @@ -13,7 +13,11 @@ breeze, SDL2, xkeyboard_config, - xorg, + xorg-server, + xf86-input-libinput, + xf86-input-evdev, + libxft, + libxcursor, libcanberra, libwacom, libxkbfile, @@ -55,11 +59,11 @@ mkKdeDerivation { libxkbfile xkeyboard_config - xorg.libXcursor - xorg.libXft - xorg.xf86inputlibinput - xorg.xf86inputevdev - xorg.xorgserver + libxcursor + libxft + xf86-input-libinput + xf86-input-evdev + xorg-server ibus ]; diff --git a/pkgs/kde/plasma/plasma-integration/default.nix b/pkgs/kde/plasma/plasma-integration/default.nix index 55c1bb7ee10a..1de1631826fe 100644 --- a/pkgs/kde/plasma/plasma-integration/default.nix +++ b/pkgs/kde/plasma/plasma-integration/default.nix @@ -3,7 +3,7 @@ qtbase, qtwayland, libsForQt5, - xorg, + libxcursor, }: mkKdeDerivation { pname = "plasma-integration"; @@ -63,7 +63,7 @@ mkKdeDerivation { extraBuildInputs = [ qtwayland - xorg.libXcursor + libxcursor ]; # Move Qt5 plugin to Qt5 plugin path diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index ebfa90da040d..71c8699e1484 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -3,7 +3,12 @@ mkKdeDerivation, replaceVars, fontconfig, - xorg, + libxtst, + libxft, + libxcursor, + libsm, + xrdb, + xmessage, lsof, pkg-config, spirv-tools, @@ -26,8 +31,8 @@ mkKdeDerivation { fcMatch = lib.getExe' fontconfig "fc-match"; lsof = lib.getExe lsof; qdbus = lib.getExe' qttools "qdbus"; - xmessage = lib.getExe xorg.xmessage; - xrdb = lib.getExe xorg.xrdb; + xmessage = lib.getExe xmessage; + xrdb = lib.getExe xrdb; # @QtBinariesDir@ only appears in the *removed* lines of the diff QtBinariesDir = null; }) @@ -54,10 +59,10 @@ mkKdeDerivation { libqalculate pipewire - xorg.libSM - xorg.libXcursor - xorg.libXtst - xorg.libXft + libsm + libxcursor + libxtst + libxft gpsd ]; @@ -67,7 +72,7 @@ mkKdeDerivation { # Hardcoded as QStrings, which are UTF-16 so Nix can't pick these up automatically postFixup = '' mkdir -p $out/nix-support - echo "${lsof} ${xorg.xmessage} ${xorg.xrdb}" > $out/nix-support/depends + echo "${lsof} ${xmessage} ${xrdb}" > $out/nix-support/depends ''; passthru.providedSessions = [ diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-libs.nix b/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-libs.nix index fe15b8e71c56..2f541a0150f8 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-libs.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/nvidia-libs.nix @@ -2,7 +2,8 @@ mkDerivation, nvidia-driver, autoPatchelfHook, - xorg, + libxext, + libx11, freetype, gtk2, gtk3, @@ -33,8 +34,8 @@ mkDerivation { glib libintl freetype - xorg.libXext - xorg.libX11 + libxext + libx11 ]; env.LOCALBASE = "${builtins.placeholder "out"}"; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/xf86-video-scfb.nix b/pkgs/os-specific/bsd/freebsd/pkgs/xf86-video-scfb.nix index 7bf3e1b28574..fbdae5df0c29 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/xf86-video-scfb.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/xf86-video-scfb.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, - xorg, + xorg-server, pkg-config, }: stdenv.mkDerivation rec { @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { sed -E -i -e "/xf86DisableRandR/d" src/scfb_driver.c ''; - buildInputs = [ xorg.xorgserver ]; + buildInputs = [ xorg-server ]; nativeBuildInputs = [ pkg-config ]; } diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 611571f016d8..c9ba00d790b0 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -29,7 +29,11 @@ ncurses ? null, x11Support ? true, freetype, - xorg, + libxft, + libxext, + libx11, + libsm, + libice, waylandSupport ? true, pango, wayland, @@ -132,12 +136,12 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals x11Support [ freetype libxfixes - xorg.libICE - xorg.libX11 - xorg.libXext - xorg.libXft - xorg.libXfixes - xorg.libSM + libice + libx11 + libxext + libxft + libxfixes + libsm expat ] ++ lib.optionals waylandSupport [ diff --git a/pkgs/os-specific/linux/lenovo-legion/app.nix b/pkgs/os-specific/linux/lenovo-legion/app.nix index 472947f1b0dd..ec001847516f 100644 --- a/pkgs/os-specific/linux/lenovo-legion/app.nix +++ b/pkgs/os-specific/linux/lenovo-legion/app.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, - xorg, + libxcb, wrapQtAppsHook, python3, nix-update-script, @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { pillow pyyaml darkdetect - xorg.libxcb + libxcb ]; postPatch = '' diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index ecc245e5a81d..9f65d0b135dd 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -106,11 +106,11 @@ let with pkgs; [ libdrm - xorg.libXext - xorg.libX11 - xorg.libXv - xorg.libXrandr - xorg.libxcb + libxext + libx11 + libxv + libxrandr + libxcb zlib stdenv.cc.cc wayland diff --git a/pkgs/servers/mir/common.nix b/pkgs/servers/mir/common.nix index a531d347cd3a..fa19b6d35f01 100644 --- a/pkgs/servers/mir/common.nix +++ b/pkgs/servers/mir/common.nix @@ -38,7 +38,9 @@ udev, wayland, wayland-scanner, - xorg, + libxcursor, + libx11, + xorgproto, xwayland, dbus, gobject-introspection, @@ -141,9 +143,9 @@ stdenv.mkDerivation ( nettle udev wayland - xorg.libX11 - xorg.libXcursor - xorg.xorgproto + libx11 + libxcursor + xorgproto xwayland ] ++ lib.optionals (lib.strings.versionAtLeast version "2.18.0") [ diff --git a/pkgs/servers/misc/qremotecontrol-server/default.nix b/pkgs/servers/misc/qremotecontrol-server/default.nix index 6114f32fdd35..0c4a5a1c60ef 100644 --- a/pkgs/servers/misc/qremotecontrol-server/default.nix +++ b/pkgs/servers/misc/qremotecontrol-server/default.nix @@ -5,7 +5,7 @@ qmake, wrapQtAppsHook, qtbase, - xorg, + libxtst, }: stdenv.mkDerivation { @@ -29,7 +29,7 @@ stdenv.mkDerivation { buildInputs = [ qtbase - xorg.libXtst + libxtst ]; postPatch = '' diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index be909083a0eb..f0cb92c52684 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -7,7 +7,11 @@ libtool, makeWrapper, perlPackages, - xorg, + libxtst, + libxi, + libx11, + libsm, + libice, libcap, alsa-lib, glib, @@ -140,11 +144,11 @@ stdenv.mkDerivation rec { ] ++ lib.optional jackaudioSupport libjack2 ++ lib.optionals x11Support [ - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libXi - xorg.libXtst + libice + libsm + libx11 + libxi + libxtst ] ++ lib.optional useSystemd systemd ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index e45cb91e0939..2b52179dc8ae 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -8,7 +8,7 @@ zstd, pkg-config, python3, - xorg, + libx11, nghttp2, libgit2, withDefaultFeatures ? true, @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage { zstd ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zlib ] - ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ xorg.libX11 ] + ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ libx11 ] ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isDarwin) [ nghttp2 libgit2 diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index e5de61e4d2b0..bd4d5e9edf72 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -10,7 +10,7 @@ libXi, libjpeg_turbo, fltk, - xorg, + libxcb-keysyms, opencl-headers, opencl-clhpp, ocl-icd, @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libXv libXtst libXi - xorg.xcbutilkeysyms + libxcb-keysyms opencl-headers opencl-clhpp ocl-icd diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix index 566793985bbc..6d6e7b297ccf 100644 --- a/pkgs/tools/admin/turbovnc/default.nix +++ b/pkgs/tools/admin/turbovnc/default.nix @@ -25,7 +25,21 @@ which, xkbcomp, xkeyboard_config, - xorg, + tab-window-manager, + libxi, + libxfont_2, + libxext, + libxdmcp, + libxdamage, + libx11, + libsm, + xtrans, + xorgproto, + xauth, + pixman, + libxshmfence, + libxkbfile, + libfontenc, xterm, }: @@ -74,26 +88,26 @@ stdenv.mkDerivation (finalAttrs: { openssl pam perl - xorg.libfontenc # for -DTVNC_SYSTEMX11=1 - xorg.libSM - xorg.libX11 - xorg.libXdamage # for -DTVNC_SYSTEMX11=1 - xorg.libXdmcp # for -DTVNC_SYSTEMX11=1 - xorg.libXext - xorg.libXfont2 # for -DTVNC_SYSTEMX11=1 - xorg.libxkbfile # for -DTVNC_SYSTEMX11=1 - xorg.libxshmfence - xorg.libXi + libfontenc # for -DTVNC_SYSTEMX11=1 + libsm + libx11 + libxdamage # for -DTVNC_SYSTEMX11=1 + libxdmcp # for -DTVNC_SYSTEMX11=1 + libxext + libxfont_2 # for -DTVNC_SYSTEMX11=1 + libxkbfile # for -DTVNC_SYSTEMX11=1 + libxshmfence + libxi mesa-gl-headers # for -DTVNC_SYSTEMX11=1 - xorg.pixman # for -DTVNC_SYSTEMX11=1 - xorg.xorgproto - xorg.xtrans # for -DTVNC_SYSTEMX11=1 + pixman # for -DTVNC_SYSTEMX11=1 + xorgproto + xtrans # for -DTVNC_SYSTEMX11=1 ]; postPatch = '' - substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "Xfont2" X11_Xfont2_LIB' 'set(X11_Xfont2_LIB ${xorg.libXfont2}/lib/libXfont2.so) #' - substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "fontenc" X11_Fontenc_LIB' 'set(X11_Fontenc_LIB ${xorg.libfontenc}/lib/libfontenc.so) #' - substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "pixman-1" X11_Pixman_LIB' 'set(X11_Pixman_LIB ${xorg.pixman}/lib/libpixman-1.so) #' + substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "Xfont2" X11_Xfont2_LIB' 'set(X11_Xfont2_LIB ${libxfont_2}/lib/libXfont2.so) #' + substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "fontenc" X11_Fontenc_LIB' 'set(X11_Fontenc_LIB ${libfontenc}/lib/libfontenc.so) #' + substituteInPlace unix/Xvnc/CMakeLists.txt --replace 'string(REGEX REPLACE "X11" "pixman-1" X11_Pixman_LIB' 'set(X11_Pixman_LIB ${pixman}/lib/libpixman-1.so) #' ''; cmakeFlags = [ @@ -141,8 +155,8 @@ stdenv.mkDerivation (finalAttrs: { --prefix PATH : ${ lib.makeBinPath [ which - xorg.twm - xorg.xauth + tab-window-manager + xauth xterm ] } diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index bd6c826dcab0..553712f2222b 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -103,7 +103,7 @@ multiStdenv.mkDerivation (finalAttrs: { # Hard code bitbridge & runtime dependencies (replaceVars ./hardcode-dependencies.patch { libdbus = dbus.lib; - libxcb32 = pkgsi686Linux.xorg.libxcb; + libxcb32 = pkgsi686Linux.libxcb; inherit wine; }) diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index d5133e0ffc91..033ddda2e542 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -17,7 +17,7 @@ pango, bash, bison, - xorg, + libxrender, python3, withXorg ? true, @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { pango bash ] - ++ optionals withXorg [ xorg.libXrender ]; + ++ optionals withXorg [ libxrender ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix index adf43ad5a74b..926af6d0cd00 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - xorg, + libxtst, pkg-config, wrapGAppsHook3, go, @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xorg.libXtst + libxtst ]; preConfigure = '' diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/tools/inputmethods/m17n-lib/otf.nix index 92dc9f5d0683..e25704c14b21 100644 --- a/pkgs/tools/inputmethods/m17n-lib/otf.nix +++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix @@ -5,7 +5,7 @@ fetchpatch, pkg-config, autoreconfHook, - xorg, + libxaw, freetype, }: @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - xorg.libXaw + libxaw freetype ]; diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index fef3147a5641..bc4ced40e54f 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -6,7 +6,7 @@ pkg-config, SDL2, qttools, - xorg, + libxtst, fetchFromGitHub, itstool, udevCheckHook, @@ -33,7 +33,7 @@ mkDerivation rec { buildInputs = [ SDL2 qttools - xorg.libXtst + libxtst ]; postPatch = '' diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index d70ee0ede206..8f6563cd2fb3 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchFromGitHub, makeWrapper, - xorg, + xvfb, getopt, xauth, util-linux, @@ -53,7 +53,7 @@ stdenvNoCC.mkDerivation { --prefix PATH : ${ lib.makeBinPath [ getopt - xorg.xvfb + xvfb xauth which util-linux diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index a856cb60b7f8..dc3ae3bec622 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -22,7 +22,18 @@ nss, pango, systemd, - xorg, + libxtst, + libxscrnsaver, + libxrender, + libxrandr, + libxi, + libxfixes, + libxext, + libxdamage, + libxcursor, + libxcomposite, + libx11, + libxcb, autoPatchelfHook, wrapGAppsHook3, runtimeShell, @@ -66,18 +77,18 @@ stdenv.mkDerivation rec { nss pango systemd - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxcb libdrm libgbm ]; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index afc18f99c2c6..96f7637af334 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -38,6 +38,8 @@ cairo, pixman, xorg, + libxi, + libxfixes, clisp, biber, woff2, @@ -751,14 +753,14 @@ rec { core # kpathsea freetype ghostscript - xorg.libX11 - xorg.libXaw - xorg.libXi - xorg.libXpm - xorg.libXmu - xorg.libXaw - xorg.libXext - xorg.libXfixes + libx11 + libxaw + libxi + libxpm + libxmu + libxaw + libxext + libxfixes ]; preConfigure = "cd texk/xdvik"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5df2551aecd..e5463bbff101 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3767,7 +3767,7 @@ with pkgs; ttfautohint-nox = ttfautohint.override { enableGUI = false; }; twilight = callPackage ../tools/graphics/twilight { - libX11 = xorg.libX11; + libx11 = libx11; }; twitch-chat-downloader = @@ -3841,7 +3841,7 @@ with pkgs; truecrack-cuda = truecrack.override { cudaSupport = true; }; turbovnc = callPackage ../tools/admin/turbovnc { - # fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; + # fontDirectories = [ font-adobe-75dpi font-misc-misc font-cursor-misc font-bh-lucidatypewriter-75dpi ]; libjpeg_turbo = libjpeg_turbo.override { enableJava = true; }; }; @@ -7005,7 +7005,7 @@ with pkgs; }; imlibsetroot = callPackage ../applications/graphics/imlibsetroot { - libXinerama = xorg.libXinerama; + libxinerama = libxinerama; }; indilib = callPackage ../development/libraries/science/astronomy/indilib { }; @@ -8096,7 +8096,7 @@ with pkgs; libmagic = file; }; - xcb-util-cursor = xorg.xcbutilcursor; + xcb-util-cursor = libxcb-cursor; xgboostWithCuda = xgboost.override { cudaSupport = true; }; @@ -9088,7 +9088,7 @@ with pkgs; xorg = recurseIntoAttrs (makeScopeWithSplicing' { otherSplices = generateSplicesForMkScope "xorg"; # Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage` - # so as not to have the newly bound xorg items already in scope, which would + # so as not to have the newly bound libxcb-cursor, # have created a cycle. f = lib.callPackageWith __splicedPackages ../servers/x11/xorg { }; }); diff --git a/pkgs/top-level/nim-overrides.nix b/pkgs/top-level/nim-overrides.nix index 3c16a740adee..3f0c587162a8 100644 --- a/pkgs/top-level/nim-overrides.nix +++ b/pkgs/top-level/nim-overrides.nix @@ -9,7 +9,9 @@ raylib, SDL2, tkrzw, - xorg, + libxinerama, + libxft, + libx11, }: # The following is list of overrides that take two arguments each: @@ -106,9 +108,9 @@ }: { buildInputs = buildInputs ++ [ - xorg.libX11 - xorg.libXft - xorg.libXinerama + libx11 + libxft + libxinerama ]; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 323e892019ba..29e619bb19de 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14544,7 +14544,7 @@ with self; pkgs.freetype pkgs.libpng pkgs.fontconfig - pkgs.xorg.libXpm + pkgs.libxpm ExtUtilsPkgConfig TestFork TestNoWarnings @@ -14559,7 +14559,7 @@ with self; "--lib_zlib_path=${pkgs.zlib.out}" "--lib_ft_path=${pkgs.freetype.out}" "--lib_fontconfig_path=${pkgs.fontconfig.lib}" - "--lib_xpm_path=${pkgs.xorg.libXpm.out}" + "--lib_xpm_path=${pkgs.libxpm.out}" ]; meta = { @@ -26611,10 +26611,10 @@ with self; pkgs.libGL pkgs.libGLU pkgs.libglut - pkgs.xorg.libX11 - pkgs.xorg.libXi - pkgs.xorg.libXmu - pkgs.xorg.libXext + pkgs.libx11 + pkgs.libxi + pkgs.libxmu + pkgs.libxext pkgs.xdummy ]; @@ -27584,8 +27584,8 @@ with self; ++ (with pkgs; [ gsl libglut - xorg.libXmu - xorg.libXi + libxmu + libxi ]); propagatedBuildInputs = [ @@ -37102,11 +37102,11 @@ with self; ''; makeMakerFlags = [ "AR=${pkgs.stdenv.cc.targetPrefix}ar" - "X11INC=${pkgs.xorg.libX11.dev}/include" - "X11LIB=${pkgs.xorg.libX11.out}/lib" + "X11INC=${pkgs.libx11.dev}/include" + "X11LIB=${pkgs.libx11.out}/lib" ]; buildInputs = [ - pkgs.xorg.libX11 + pkgs.libx11 pkgs.libpng ]; env = lib.optionalAttrs stdenv.cc.isGNU { @@ -37131,8 +37131,8 @@ with self; hash = "sha256-Rj4oTsRxN+fEJclpGwKo3sXOJytY6h9jWa6AQaI53Q8="; }; makeMakerFlags = [ - "X11INC=${pkgs.xorg.libX11.dev}/include" - "X11LIB=${pkgs.xorg.libX11.out}/lib" + "X11INC=${pkgs.libx11.dev}/include" + "X11LIB=${pkgs.libx11.out}/lib" ]; buildInputs = [ Tk ]; doCheck = false; # Expects working X11. @@ -38212,12 +38212,12 @@ with self; hash = "sha256-2P3cB455ge4xt2CMZTZFyyDwFr3dx8VQtNUn79NiR0g="; }; buildInputs = [ - pkgs.xorg.libXext - pkgs.xorg.libXScrnSaver - pkgs.xorg.libX11 + pkgs.libxext + pkgs.libxscrnsaver + pkgs.libx11 ]; propagatedBuildInputs = [ InlineC ]; - patchPhase = "sed -i -e 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext.out}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm"; + patchPhase = "sed -i -e 's,-L/usr/X11R6/lib/,-L${pkgs.libx11.out}/lib/ -L${pkgs.libxext.out}/lib/ -L${pkgs.libxscrnsaver}/lib/,' IdleTime.pm"; meta = { description = "Get the idle time of X11"; license = with lib.licenses; [ @@ -38274,10 +38274,10 @@ with self; hash = "sha256-3O7eU3AGEP/xQtydXE5M0DcMiKTysTcfnL9NjYzm9ks="; }; buildInputs = [ - pkgs.xorg.libX11 - pkgs.xorg.libXi - pkgs.xorg.libXt - pkgs.xorg.libXtst + pkgs.libx11 + pkgs.libxi + pkgs.libxt + pkgs.libxtst ]; NIX_CFLAGS_LINK = "-lX11"; doCheck = false; # requires an X server @@ -38306,10 +38306,10 @@ with self; env.AUTOMATED_TESTING = false; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ - pkgs.xorg.libxcb - pkgs.xorg.xcbproto - pkgs.xorg.xcbutil - pkgs.xorg.xcbutilwm + pkgs.libxcb + pkgs.xcb-proto + pkgs.libxcb-util + pkgs.libxcb-wm ExtUtilsDepends ExtUtilsPkgConfig TestDeep