gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove references to the xorg namespace in pkgs/ (#482814)

Browse Source
This commit is contained in:
Jo
2026-01-26 13:48:33 +00:00
committed by GitHub
parent b53818f743 233631a84f
commit 78c1924b13
731 changed files with 5559 additions and 3913 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
+12 -7
View File
@@ -19,7 +19,12 @@
pulseaudio,
wrapGAppsHook3,
xdg-utils,
xorg,
libxcb-util,
libxcb-wm,
libxtst,
libxcursor,
libx11,
libxcb,
zlib,
}:
@@ -41,7 +46,7 @@ stdenv.mkDerivation rec {
dontBuild = true;
dontWrapGApps = true; # we only want $gappsWrapperArgs here
buildInputs = with xorg; [
buildInputs = [
alsa-lib
cairo
freetype
@@ -53,15 +58,15 @@ stdenv.mkDerivation rec {
# libjpeg8 is required for converting jpeg's to colour palettes
libjpeg
libxcb
libXcursor
libX11
libXtst
libxcursor
libx11
libxtst
libxkbcommon
pipewire
pulseaudio
(lib.getLib stdenv.cc.cc)
xcbutil
xcbutilwm
libxcb-util
libxcb-wm
zlib
];
pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
+12 -7
View File
@@ -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
];
pkgs/applications/audio/open-music-kontrollers/mephisto.nix
+4 -3
View File
@@ -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
];
pkgs/applications/backup/timeshift/wrapper.nix
+2 -2
View File
@@ -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 = ''
pkgs/applications/editors/android-studio/common.nix
+4 -3
View File
@@ -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
pkgs/applications/editors/jetbrains/ides/rider.nix
+2 -2
View File
@@ -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
pkgs/applications/editors/jetbrains/source/build.nix
+2 -2
View File
@@ -22,7 +22,7 @@
maven,
p7zip,
pkg-config,
xorg,
libx11,
}:
{
version,
@@ -97,7 +97,7 @@ let
];
buildInputs = [
glib
xorg.libX11
libx11
libdbusmenu
];
inherit src;
pkgs/applications/editors/sublime/3/common.nix
+2 -2
View File
@@ -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
pkgs/applications/editors/sublime/4/common.nix
+4 -3
View File
@@ -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
pkgs/applications/editors/vim/plugins/overrides.nix
+2 -2
View File
@@ -48,7 +48,7 @@
xdg-utils,
xdotool,
xkb-switch,
xorg,
xwininfo,
xxd,
ycmd,
zathura,
@@ -3404,7 +3404,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
'';
};
pkgs/applications/editors/vscode/generic.nix
+16 -9
View File
@@ -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 [
pkgs/applications/emulators/libretro/cores/bsnes-hd.nix
+4 -3
View File
@@ -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";
pkgs/applications/emulators/libretro/cores/desmume.nix
+2 -2
View File
@@ -6,7 +6,7 @@
libpcap,
libGLU,
libGL,
xorg,
libx11,
}:
mkLibretroCore {
core = "desmume";
@@ -23,7 +23,7 @@ mkLibretroCore {
libpcap
libGLU
libGL
xorg.libX11
libx11
];
makeFlags =
pkgs/applications/emulators/libretro/cores/desmume2015.nix
+2 -2
View File
@@ -6,7 +6,7 @@
libpcap,
libGLU,
libGL,
xorg,
libx11,
}:
mkLibretroCore {
core = "desmume2015";
@@ -23,7 +23,7 @@ mkLibretroCore {
libpcap
libGLU
libGL
xorg.libX11
libx11
];
makeFlags =
pkgs/applications/emulators/libretro/cores/dolphin.nix
+20 -11
View File
@@ -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";
pkgs/applications/emulators/libretro/cores/mupen64plus.nix
+2 -2
View File
@@ -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 = [
pkgs/applications/emulators/libretro/cores/play.nix
+2 -2
View File
@@ -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";
pkgs/applications/emulators/libretro/cores/ppsspp.nix
+2 -2
View File
@@ -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 = [
pkgs/applications/emulators/libretro/cores/same_cdi.nix
+2 -2
View File
@@ -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 = {
pkgs/applications/emulators/wine/base.nix
+11 -11
View File
@@ -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
@@ -163,17 +163,17 @@ stdenv.mkDerivation (
pkgs.libdrm
]
++ lib.optionals x11Support (
with pkgs.xorg;
with pkgs;
[
libX11
libXcomposite
libXcursor
libXext
libXfixes
libXi
libXrandr
libXrender
libXxf86vm
libx11
libxcomposite
libxcursor
libxext
libxfixes
libxi
libxrandr
libxrender
libxxf86vm
]
)
++ lib.optionals waylandSupport (
pkgs/applications/graphics/gimp/2.0/default.nix
+2 -2
View File
@@ -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
pkgs/applications/graphics/gimp/default.nix
+4 -3
View File
@@ -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
pkgs/applications/graphics/imlibsetroot/default.nix
+2 -2
View File
@@ -3,7 +3,7 @@
stdenv,
fetchurl,
libX11,
libXinerama,
libxinerama,
imlib2,
}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
buildInputs = [
libX11
imlib2
libXinerama
libxinerama
];
buildPhase = ''
pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix
+4 -3
View File
@@ -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
];
pkgs/applications/misc/cubocore-packages/corestuff/default.nix
+2 -2
View File
@@ -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
];
pkgs/applications/misc/cubocore-packages/coretoppings/default.nix
+6 -4
View File
@@ -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
pkgs/applications/misc/maliit-framework/default.nix
+4 -3
View File
@@ -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 = [
pkgs/applications/misc/opencpn/default.nix
+4 -3
View File
@@ -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
pkgs/applications/misc/organicmaps/default.nix
+6 -4
View File
@@ -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
pkgs/applications/misc/prusa-slicer/default.nix
+2 -2
View File
@@ -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
pkgs/applications/networking/browsers/firefox/wrapper.nix
+18 -15
View File
@@ -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,
@@ -31,6 +36,7 @@
sndio,
libjack2,
speechd-minimal,
zlib,
}:
## configurability of the wrapper itself
@@ -98,7 +104,7 @@ let
libva
libgbm
libnotify
xorg.libXScrnSaver
libxscrnsaver
cups
pciutils
vulkan-loader
@@ -109,19 +115,16 @@ let
++ lib.optional ffmpegSupport ffmpeg_7
++ lib.optional gssSupport libkrb5
++ lib.optional useGlvnd libglvnd
++ lib.optionals (cfg.enableQuakeLive or false) (
with xorg;
[
stdenv.cc
libX11
libXxf86dga
libXxf86vm
libXext
libXt
alsa-lib
zlib
]
)
++ lib.optionals (cfg.enableQuakeLive or false) [
stdenv.cc
libx11
libxxf86dga
libxxf86vm
libxext
libxt
alsa-lib
zlib
]
++ lib.optional (config.pulseaudio or (!isDarwin)) libpulseaudio
++ lib.optional alsaSupport alsa-lib
++ lib.optional sndioSupport sndio
pkgs/applications/networking/dropbox/default.nix
+13 -16
View File
@@ -55,23 +55,20 @@ buildFHSEnv {
unsharePid = false;
targetPkgs =
pkgs:
with pkgs;
with xorg;
[
libICE
libSM
libX11
libXcomposite
libXdamage
libXext
libXfixes
libXrender
libXmu
libXxf86vm
pkgs: with pkgs; [
libice
libsm
libx11
libxcomposite
libxdamage
libxext
libxfixes
libxrender
libxmu
libxxf86vm
libGL
libxcb
xkeyboardconfig
xkeyboard-config
curl
dbus
firefox-bin
@@ -87,7 +84,7 @@ buildFHSEnv {
zlib
libgbm
libxshmfence
libpthreadstubs
libpthread-stubs
libappindicator
];
pkgs/applications/networking/instant-messengers/ferdium/default.nix
+2 -2
View File
@@ -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;
pkgs/applications/networking/instant-messengers/franz/generic.nix
+24 -14
View File
@@ -5,7 +5,17 @@
wrapGAppsHook3,
autoPatchelfHook,
dpkg,
xorg,
libxtst,
libxscrnsaver,
libxrender,
libxrandr,
libxi,
libxfixes,
libxext,
libxdamage,
libxcursor,
libxcomposite,
libx11,
atk,
glib,
pango,
@@ -71,19 +81,19 @@ stdenv.mkDerivation (
];
buildInputs =
extraBuildInputs
++ (with xorg; [
libXi
libXcursor
libXdamage
libXrandr
libXcomposite
libXext
libXfixes
libXrender
libX11
libXtst
libXScrnSaver
])
++ [
libxi
libxcursor
libxdamage
libxrandr
libxcomposite
libxext
libxfixes
libxrender
libx11
libxtst
libxscrnsaver
]
++ [
libgbm
gtk3
pkgs/applications/networking/instant-messengers/ripcord/default.nix
+11 -12
View File
@@ -13,7 +13,10 @@
desktop-file-utils,
imagemagick,
twemoji-color-font,
xorg,
xkeyboard-config,
libxscrnsaver,
libxcursor,
libx11,
libsodium,
libopus,
libGL,
@@ -47,20 +50,16 @@ mkDerivation rec {
libopus
libGL
alsa-lib
]
++ [
qtbase
qtsvg
qtmultimedia
qtwebsockets
qtimageformats
]
++ (with xorg; [
libX11
libXScrnSaver
libXcursor
xkeyboardconfig
]);
libx11
libxscrnsaver
libxcursor
xkeyboard-config
];
fontsConf = makeFontsConf {
fontDirectories = [ twemoji-color-font ];
@@ -89,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
pkgs/applications/networking/netmaker/default.nix
+10 -6
View File
@@ -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 = {
pkgs/applications/networking/p2p/transmission/4.nix
+2 -2
View File
@@ -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 ];
pkgs/applications/networking/remote/citrix-workspace/generic.nix
+27 -16
View File
@@ -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 =
pkgs/applications/office/libreoffice/default.nix
+18 -10
View File
@@ -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
pkgs/applications/office/libreoffice/wrapper.nix
+2 -2
View File
@@ -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;
pkgs/applications/radio/soapysdr/default.nix
+1 -1
View File
@@ -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
]
pkgs/applications/science/electronics/bitscope/common.nix
+2 -2
View File
@@ -10,7 +10,7 @@
pango,
lib,
stdenv,
xorg,
libx11,
}:
{
@@ -52,7 +52,7 @@ let
glib
gtk2-x11
pango
xorg.libX11
libx11
];
dontBuild = true;
pkgs/applications/science/math/cplex/default.nix
+3 -3
View File
@@ -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
''
pkgs/applications/science/math/wolfram-engine/default.nix
+24 -15
View File
@@ -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,21 +74,19 @@ stdenv.mkDerivation rec {
zlib
libGL
libGLU
]
++ (with xorg; [
libX11
libXext
libXtst
libXi
libXmu
libXrender
libx11
libxext
libxtst
libxi
libxmu
libxrender
libxcb
libXcursor
libXfixes
libXrandr
libICE
libSM
]);
libxcursor
libxfixes
libxrandr
libice
libsm
];
# some bundled libs are found through LD_LIBRARY_PATH
autoPatchelfIgnoreMissingDeps = true;
pkgs/applications/version-management/sublime-merge/common.nix
+2 -2
View File
@@ -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
pkgs/applications/video/obs-studio/default.nix
+2 -2
View File
@@ -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
]
pkgs/applications/video/obs-studio/plugins/input-overlay.nix
+16 -9
View File
@@ -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
];
pkgs/applications/video/streamlink-twitch-gui/bin.nix
+24 -13
View File
@@ -24,7 +24,18 @@
libgbm,
nss,
nspr,
xorg,
libxtst,
libxscrnsaver,
libxrender,
libxrandr,
libxi,
libxfixes,
libxext,
libxdamage,
libxcursor,
libxcomposite,
libx11,
libxcb,
streamlink,
}:
let
@@ -53,7 +64,7 @@ stdenv.mkDerivation rec {
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
nativeBuildInputs = with xorg; [
nativeBuildInputs = [
at-spi2-core
atk
alsa-lib
@@ -72,18 +83,18 @@ stdenv.mkDerivation rec {
nss
nspr
libuuid
libX11
libx11
libxcb
libXcomposite
libXcursor
libXdamage
libXext
libXfixes
libXi
libXrandr
libXrender
libXScrnSaver
libXtst
libxcomposite
libxcursor
libxdamage
libxext
libxfixes
libxi
libxrandr
libxrender
libxscrnsaver
libxtst
makeWrapper
wrapGAppsHook3
];
pkgs/applications/video/vdr/softhddevice/default.nix
+4 -3
View File
@@ -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
];
pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix
+5 -4
View File
@@ -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 = ''
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+17 -12
View File
@@ -5,12 +5,17 @@
lib,
dbus,
kmod,
xorg,
libxt,
libxrandr,
libxmu,
libxfixes,
libxext,
libxcursor,
zlib,
patchelf,
makeWrapper,
wayland,
libX11,
libx11,
}:
let
virtualboxVersion = "7.2.4";
@@ -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";
@@ -56,11 +61,11 @@ let
}
{
name = "libX11.so";
pkg = libX11;
pkg = libx11;
}
{
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
pkgs/applications/window-managers/awesome/default.nix
+18 -10
View File
@@ -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
]
pkgs/applications/window-managers/i3/default.nix
+4 -3
View File
@@ -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
];
pkgs/applications/window-managers/i3/easyfocus.nix
+2 -2
View File
@@ -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
];
pkgs/applications/window-managers/i3/lock-color.nix
+2 -2
View File
@@ -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" ];
pkgs/applications/window-managers/i3/lock-fancy-rapid.nix
+2 -2
View File
@@ -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 ];
pkgs/applications/window-managers/i3/lock.nix
+2 -2
View File
@@ -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 = {
pkgs/applications/window-managers/i3/wmfocus.nix
+2 -2
View File
@@ -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
pkgs/applications/window-managers/jwm/default.nix
+2 -2
View File
@@ -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
];
pkgs/applications/window-managers/wayfire/default.nix
+2 -2
View File
@@ -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
];
pkgs/build-support/appimage/default.nix
+27 -27
View File
@@ -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
pkgs/build-support/build-mozilla-mach/default.nix
+22 -12
View File
@@ -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)
]
pkgs/build-support/build-nim-sbom.nix
+2 -2
View File
@@ -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
pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix
+1 -1
View File
@@ -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
pkgs/by-name/_0/_010editor/package.nix
+3 -3
View File
@@ -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
pkgs/by-name/_1/_1fps/package.nix
+6 -4
View File
@@ -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 = {
pkgs/by-name/ac/activate-linux/package.nix
+16 -9
View File
@@ -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
pkgs/by-name/ah/ahk_x11/package.nix
+8 -13
View File
@@ -5,7 +5,10 @@
copyDesktopItems,
gtk3,
libxkbcommon,
xorg,
libxinerama,
libxtst,
libxext,
libxi,
libnotify,
gobject-introspection, # needed to build gi-crystal
openbox,
@@ -21,14 +24,6 @@
let
pname = "ahk_x11";
version = "1.0.7";
inherit (xorg)
libXinerama
libXtst
libXext
libXi
;
in
crystal.buildCrystalPackage {
inherit pname version;
@@ -75,10 +70,10 @@ crystal.buildCrystalPackage {
buildInputs = [
gtk3
libxkbcommon
libXinerama
libXtst
libXext
libXi
libxinerama
libxtst
libxext
libxi
libnotify
];
nativeBuildInputs = [
pkgs/by-name/ai/airgeddon/package.nix
+4 -3
View File
@@ -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 {
pkgs/by-name/ai/airtame/package.nix
+11 -7
View File
@@ -23,7 +23,11 @@
libGL,
vulkan-loader,
curlWithGnuTls,
xorg,
libxrandr,
libxfixes,
libxext,
libxdamage,
libxcomposite,
lib,
libnotify,
libappindicator-gtk3,
@@ -31,12 +35,12 @@
pciutils,
}:
let
xorgDeps = with xorg; [
libXdamage
libXext
libXfixes
libXcomposite
libXrandr
xorgDeps = [
libxdamage
libxext
libxfixes
libxcomposite
libxrandr
];
deps = [
pkgs/by-name/ai/airwin2rack/package.nix
+14 -8
View File
@@ -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
pkgs/by-name/aj/aja-desktop-software/package.nix
+8 -8
View File
@@ -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
pkgs/by-name/al/alacritty/package.nix
+10 -6
View File
@@ -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
];
pkgs/by-name/al/alfaview/package.nix
+10 -6
View File
@@ -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;
pkgs/by-name/al/alttab/package.nix
+16 -9
View File
@@ -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 = {
pkgs/by-name/al/alttpr-opentracker/package.nix
+9 -8
View File
@@ -13,7 +13,10 @@
libunwind,
openssl,
xinput,
xorg,
libxi,
libx11,
libsm,
libice,
}:
buildDotnetModule rec {
pname = "opentracker";
@@ -52,13 +55,11 @@ buildDotnetModule rec {
gtk3
openssl
xinput
]
++ (with xorg; [
libICE
libSM
libX11
libXi
]);
libice
libsm
libx11
libxi
];
autoPatchelfIgnoreMissingDeps = [
"libc.musl-x86_64.so.1"
pkgs/by-name/am/am2rlauncher/package.nix
+4 -4
View File
@@ -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
pkgs/by-name/am/amoeba/package.nix
+2 -2
View File
@@ -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 = ''
pkgs/by-name/an/anakron/package.nix
+2 -2
View File
@@ -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
pkgs/by-name/an/anarch/package.nix
+12 -7
View File
@@ -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
pkgs/by-name/an/angle/package.nix
+8 -5
View File
@@ -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
pkgs/by-name/an/angr-management/package.nix
+2 -2
View File
@@ -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 ];
pkgs/by-name/an/animatch/package.nix
+2 -2
View File
@@ -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 = [
pkgs/by-name/an/animeko/package.nix
+2 -2
View File
@@ -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
pkgs/by-name/an/anki-bin/package.nix
+2 -2
View File
@@ -93,8 +93,8 @@ let
targetPkgs =
pkgs:
(with pkgs; [
xorg.libxkbfile
xorg.libxshmfence
libxkbfile
libxshmfence
libxcb-cursor
krb5
zstd
pkgs/by-name/an/anttweakbar/package.nix
+2 -2
View File
@@ -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
];
pkgs/by-name/an/anvil-editor/package.nix
+8 -5
View File
@@ -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?
pkgs/by-name/an/anydesk/package.nix
+27 -16
View File
@@ -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,23 +76,21 @@ stdenv.mkDerivation (finalAttrs: {
polkit
polkit_gnome
pulseaudio
]
++ (with xorg; [
libxcb
libxkbfile
libX11
libXdamage
libXext
libXfixes
libXi
libXmu
libXrandr
libXtst
libXt
libICE
libSM
libXrender
]);
libx11
libxdamage
libxext
libxfixes
libxi
libxmu
libxrandr
libxtst
libxt
libice
libsm
libxrender
];
nativeBuildInputs = [
copyDesktopItems
pkgs/by-name/ap/appgate-sdp/package.nix
+26 -14
View File
@@ -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
pkgs/by-name/ar/ardour/package.nix
+4 -3
View File
@@ -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
pkgs/by-name/as/astrolog/package.nix
+2 -2
View File
@@ -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 =
pkgs/by-name/as/astromenace/package.nix
+6 -4
View File
@@ -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
pkgs/by-name/at/atlauncher/package.nix
+6 -4
View File
@@ -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
pkgs/by-name/av/avocode/package.nix
+50 -41
View File
@@ -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,
@@ -41,46 +53,43 @@ stdenv.mkDerivation rec {
sha256 = "sha256-vNQT4jyMIIAk1pV3Hrp40nawFutWCv7xtwg2gU6ejy0=";
};
libPath = lib.makeLibraryPath (
with xorg;
[
stdenv.cc.cc
at-spi2-core.out
gdk-pixbuf
glib
gtk3
atk
at-spi2-atk
pango
cairo
freetype
fontconfig
dbus
nss
nspr
alsa-lib
cups
expat
udev
libX11
libxcb
libxshmfence
libxkbcommon
libXi
libXcursor
libXdamage
libXrandr
libXcomposite
libXext
libXfixes
libXrender
libXtst
libXScrnSaver
libuuid
libdrm
libgbm
]
);
libPath = lib.makeLibraryPath [
stdenv.cc.cc
at-spi2-core.out
gdk-pixbuf
glib
gtk3
atk
at-spi2-atk
pango
cairo
freetype
fontconfig
dbus
nss
nspr
alsa-lib
cups
expat
udev
libx11
libxcb
libxshmfence
libxkbcommon
libxi
libxcursor
libxdamage
libxrandr
libxcomposite
libxext
libxfixes
libxrender
libxtst
libxscrnsaver
libuuid
libdrm
libgbm
];
desktopItem = makeDesktopItem {
name = "Avocode";
pkgs/by-name/az/azahar/package.nix
+6 -4
View File
@@ -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
pkgs/by-name/az/azuredatastudio/package.nix
+18 -10
View File
@@ -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
pkgs/by-name/ba/badlion-client/package.nix
+1 -1
View File
@@ -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";
pkgs/by-name/ba/bambu-studio/package.nix
+2 -2
View File
@@ -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 ]
pkgs/by-name/ba/basalt-monado/package.nix
+2 -2
View File
@@ -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
pkgs/by-name/ba/bashrun2/package.nix
+2 -2
View File
@@ -3,7 +3,7 @@
lib,
stdenv,
makeWrapper,
xorg,
libx11,
ncurses,
coreutils,
bashInteractive,
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
xorg.libX11
libx11
];
patches = [

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