mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-21 08:01:31 +00:00
xkeyboardconfig: rename references and deprecate alias
this shouldn't create any rebuilds
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
qtdeclarative,
|
||||
qtquickcontrols2 ? null,
|
||||
systemd,
|
||||
xkeyboardconfig,
|
||||
xkeyboard-config,
|
||||
nixosTests,
|
||||
docutils,
|
||||
}:
|
||||
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/greeter/waylandkeyboardbackend.cpp \
|
||||
--replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"
|
||||
--replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboard-config}/share/X11/xkb/rules/evdev.xml"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
cups,
|
||||
alsa-lib,
|
||||
|
||||
xkeyboardconfig,
|
||||
xkeyboard-config,
|
||||
autoPatchelfHook,
|
||||
wrapQtAppsHook,
|
||||
}:
|
||||
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
autoPatchelfHook
|
||||
wrapQtAppsHook
|
||||
];
|
||||
propagatedBuildInputs = [ xkeyboardconfig ];
|
||||
propagatedBuildInputs = [ xkeyboard-config ];
|
||||
buildInputs = [
|
||||
dbus
|
||||
cups
|
||||
@@ -126,7 +126,7 @@ stdenv.mkDerivation rec {
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/googleearth-pro \
|
||||
--set QT_QPA_PLATFORM xcb \
|
||||
--set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb"
|
||||
--set QT_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
shared-mime-info,
|
||||
stdenv,
|
||||
writeShellApplication,
|
||||
xkeyboardconfig,
|
||||
xkeyboard-config,
|
||||
}:
|
||||
let
|
||||
pname = "ideamaker";
|
||||
@@ -86,7 +86,7 @@ stdenv.mkDerivation {
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/ideamaker \
|
||||
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
|
||||
--set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \
|
||||
--set QT_XKB_CONFIG_ROOT "${xkeyboard-config}/share/X11/xkb" \
|
||||
--set QTCOMPOSE "${libX11.out}/share/X11/locale" \
|
||||
--set KDEDIRS "$HOME/.nix-profile:/nix/var/nix/profiles/default" \
|
||||
--set NIX_REDIRECTS /usr/share=$out/share/
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
zlib,
|
||||
pciutils,
|
||||
makeDesktopItem,
|
||||
xkeyboardconfig,
|
||||
xkeyboard-config,
|
||||
dbus,
|
||||
runtimeShell,
|
||||
libGL,
|
||||
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
|
||||
cat > "$out/bin/saleae-logic" << EOF
|
||||
#!${runtimeShell}
|
||||
export LD_PRELOAD="$out/lib/preload.so"
|
||||
export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"
|
||||
export QT_XKB_CONFIG_ROOT="${xkeyboard-config}/share/X11/xkb"
|
||||
export PATH="${pciutils}/bin:\$PATH"
|
||||
exec "$out/Logic" "\$@"
|
||||
EOF
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
libXtst,
|
||||
libXrandr,
|
||||
libXinerama,
|
||||
xkeyboardconfig,
|
||||
xkeyboard-config,
|
||||
xinput,
|
||||
avahi-compat,
|
||||
libsForQt5,
|
||||
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
substituteInPlace src/lib/synergy/unix/AppUtilUnix.cpp \
|
||||
--replace-fail "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"
|
||||
--replace-fail "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboard-config}/share/X11/xkb/rules/evdev.xml"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# xkeyboardconfig variant extensible with custom layouts.
|
||||
# xkeyboard-config variant extensible with custom layouts.
|
||||
# See nixos/modules/services/x11/extra-layouts.nix
|
||||
{
|
||||
lib,
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
pixman,
|
||||
udev,
|
||||
xkbcomp,
|
||||
xkeyboardconfig,
|
||||
xkeyboard-config,
|
||||
xorgproto,
|
||||
xtrans,
|
||||
zlib,
|
||||
@@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-Ddefault_font_path="
|
||||
|
||||
"-Dxkb_bin_dir=${xkbcomp}/bin"
|
||||
"-Dxkb_dir=${xkeyboardconfig}/share/X11/xkb"
|
||||
"-Dxkb_dir=${xkeyboard-config}/share/X11/xkb"
|
||||
"-Dxkb_output_dir=$out/share/X11/xkb/compiled"
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
xcbutilrenderutil,
|
||||
xcbutilwm,
|
||||
xkbcomp,
|
||||
xkeyboardconfig,
|
||||
xkeyboard-config,
|
||||
xorgproto,
|
||||
xtrans,
|
||||
}:
|
||||
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--disable-xquartz"
|
||||
"--disable-xwayland"
|
||||
"--with-xkb-bin-directory=${xkbcomp}/bin"
|
||||
"--with-xkb-path=${xkeyboardconfig}/share/X11/xkb"
|
||||
"--with-xkb-path=${xkeyboard-config}/share/X11/xkb"
|
||||
"--with-xkb-output=$out/share/X11/xkb/compiled"
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin "--without-dtrace";
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
kirigami ? null,
|
||||
kirigami2 ? null,
|
||||
isocodes,
|
||||
xkeyboardconfig,
|
||||
xkeyboard-config,
|
||||
libxkbfile,
|
||||
libplasma ? null,
|
||||
plasma-framework ? null,
|
||||
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
|
||||
kitemviews
|
||||
kwidgetsaddons
|
||||
isocodes
|
||||
xkeyboardconfig
|
||||
xkeyboard-config
|
||||
libxkbfile
|
||||
]
|
||||
++ lib.optionals (lib.versions.major qtbase.version == "5") [
|
||||
|
||||
@@ -1961,6 +1961,7 @@ mapAliases {
|
||||
xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22
|
||||
xinput_calibrator = xinput-calibrator; # Added 2025-08-28
|
||||
xjump = throw "'xjump' has been removed as it is unmaintained"; # Added 2025-08-22
|
||||
xkeyboardconfig = xkeyboard-config; # Added 2026-02-04
|
||||
xkeyboardconfig_custom = xkeyboard-config_custom; # Added 2026-01-19
|
||||
xmlada = throw "'xmlada' has been renamed to/replaced by 'gnatPackages.xmlada'"; # Converted to throw 2025-10-27
|
||||
xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18
|
||||
|
||||
@@ -8868,7 +8868,6 @@ with pkgs;
|
||||
xf86inputevdev = xf86-input-evdev;
|
||||
xf86inputlibinput = xf86-input-libinput;
|
||||
xf86videonouveau = xf86-video-nouveau;
|
||||
xkeyboardconfig = xkeyboard-config;
|
||||
|
||||
zabbixFor = version: rec {
|
||||
agent = (callPackages ../servers/monitoring/zabbix/agent.nix { }).${version};
|
||||
|
||||
Reference in New Issue
Block a user