diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 7c16d2ea8900..deac2c252a68 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -30,7 +30,7 @@ let xf86-video-intel xf86-video-mga xf86-video-neomagic - xf86_video_nested + xf86-video-nested xf86-video-nouveau xf86-video-nv xf86-video-omap diff --git a/pkgs/by-name/xf/xf86-video-nested/package.nix b/pkgs/by-name/xf/xf86-video-nested/package.nix new file mode 100644 index 000000000000..59e712a32050 --- /dev/null +++ b/pkgs/by-name/xf/xf86-video-nested/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + xorgproto, + libx11, + libxext, + xorg-server, +}: + +stdenv.mkDerivation { + pname = "xf86-video-nested"; + version = "0-unstable-2024-10-26"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "driver"; + repo = "xf86-video-nested"; + rev = "03dab66493622835a29b873cd63df489f1a96ed9"; + hash = "sha256-EPQOcE23m6RSG05txjBjREBz9JlwZrmK4Rn6Fg2IyT4="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + util-macros + ]; + + buildInputs = [ + xorg-server + xorgproto + libx11 + libxext + ]; + + meta = { + homepage = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-nested"; + description = "Video ddriver to run Xorg on top of another X server"; + maintainers = [ ]; + platforms = lib.platforms.unix; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/by-name/xf/xf86_video_nested/package.nix b/pkgs/by-name/xf/xf86_video_nested/package.nix deleted file mode 100644 index 99c486d13c15..000000000000 --- a/pkgs/by-name/xf/xf86_video_nested/package.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - autoreconfHook, - xorgproto, - libX11, - libXext, - pixman, - pkg-config, - utilmacros, - xorgserver, -}: - -stdenv.mkDerivation { - pname = "xf86-video-nested"; - version = "unstable-2017-06-12"; - - src = fetchgit { - url = "git://anongit.freedesktop.org/xorg/driver/xf86-video-nested"; - rev = "6a48b385c41ea89354d0b2ee7f4649a1d1d9ec70"; - sha256 = "133rd2kvr2q2wmwpx82bb93qbi8wm8qp1vlmbhgc7aslz0j4cqqv"; - }; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - ]; - - buildInputs = [ - xorgproto - libX11 - libXext - pixman - utilmacros - xorgserver - ]; - - hardeningDisable = [ "fortify" ]; - - CFLAGS = "-I${pixman}/include/pixman-1"; - - meta = { - homepage = "https://cgit.freedesktop.org/xorg/driver/xf86-video-nested"; - description = "Driver to run Xorg on top of Xorg or something else"; - maintainers = [ ]; - platforms = lib.platforms.linux; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 01a74ac3e45a..18118c0e3080 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1872,6 +1872,7 @@ mapAliases { xdragon = throw "'xdragon' has been renamed to/replaced by 'dragon-drop'"; # Converted to throw 2025-10-27 xf86_input_cmt = xf86-input-cmt; # Added 2025-12-12 xf86_input_wacom = xf86-input-wacom; # Added 2025-12-12 + xf86_video_nested = xf86-video-nested; # added 2026-01-13 xf86inputjoystick = xf86-input-joystick; # Added 2026-01-19 xf86inputkeyboard = xf86-input-keyboard; # Added 2026-01-19 xf86inputmouse = xf86-input-mouse; # Added 2026-01-19