From 5a95ffa9f16c910cf6caa458e3a4e3157d934b01 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sat, 13 Dec 2025 14:36:48 +0100 Subject: [PATCH 1/5] xinit: refactor & move to pkgs/by-name from xorg namespace relevant changes: - switch to GitLab source instead of release tarball - remove the outdated postPatch subtituteInPlace - I would have needed to go into postConfigure when using GitLab source, however swapping --replace with --replace-fail made it fail. - change the postFixup sed command to a somewhat equivalent substituteInPlace - remove the stdenv = clangStdenv override for darwin since stdenv is using clang on darwin anyway --- pkgs/by-name/xi/xinit/package.nix | 85 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 38 +-------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 36 -------- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 89 insertions(+), 73 deletions(-) create mode 100644 pkgs/by-name/xi/xinit/package.nix diff --git a/pkgs/by-name/xi/xinit/package.nix b/pkgs/by-name/xi/xinit/package.nix new file mode 100644 index 000000000000..cd1b7eb26009 --- /dev/null +++ b/pkgs/by-name/xi/xinit/package.nix @@ -0,0 +1,85 @@ +{ + lib, + stdenv, + fetchFromGitLab, + buildPackages, + autoreconfHook, + pkg-config, + util-macros, + darwin, + libx11, + xorgproto, + xauth, + xorg-server, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xinit"; + version = "1.4.4"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "app"; + repo = "xinit"; + tag = "xinit-${finalAttrs.version}"; + hash = "sha256-1GL0xJ/l9BnhoUyD5m1Ch86hjcRdBnys366qM4Lj84U="; + }; + + strictDeps = true; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + util-macros + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.bootstrap_cmds + ]; + + buildInputs = [ + libx11 + xorgproto + ]; + + propagatedBuildInputs = [ + xauth + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libx11 + xorgproto + ]; + + configureFlags = [ + "--with-xserver=${xorg-server.out}/bin/X" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "--with-bundle-id-prefix=org.nixos.xquartz" + "--with-launchdaemons-dir=${placeholder "out"}/LaunchDaemons" + "--with-launchagents-dir=${placeholder "out"}/LaunchAgents" + ]; + + postFixup = '' + substituteInPlace $out/bin/startx \ + --replace-fail '"''${prefix}/etc/X11/xinit/xinitrc"' '/etc/X11/xinit/xinitrc' \ + --replace-fail '"$xinitdir/xserverrc"' '/etc/X11/xinit/xserverrc' + ''; + + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version-regex=xinit-(.*)" ]; }; + }; + + meta = { + description = "X server & client startup utilities (includes startx)"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xinit"; + license = with lib.licenses; [ + mitOpenGroup + x11 + ]; + mainProgram = "xinit"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 79141d56bf1e..b62e8afb1f99 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -134,6 +134,7 @@ xgamma, xgc, xhost, + xinit, xkbevd, xkbprint, xkbutils, @@ -221,6 +222,7 @@ self: with self; { xgamma xgc xhost + xinit xkbevd xkbprint xkbutils @@ -2124,42 +2126,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xinit = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xinit"; - version = "1.4.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xinit-1.4.4.tar.xz"; - sha256 = "1ygymifhg500sx1ybk8x4d1zn4g4ywvlnyvqwcf9hzsc2rx7r920"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xinput = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 9c2c32c17c80..4d3895a46e2c 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -466,6 +466,7 @@ print OUT < Date: Sat, 13 Dec 2025 14:49:21 +0100 Subject: [PATCH 2/5] xinput: refactor & move to pkgs/by-name from xorg namespace relevant changes: - switch to GitLab source instead of release tarball --- pkgs/by-name/xi/xinput/package.nix | 61 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 46 +------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 2 - pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 65 insertions(+), 47 deletions(-) create mode 100644 pkgs/by-name/xi/xinput/package.nix diff --git a/pkgs/by-name/xi/xinput/package.nix b/pkgs/by-name/xi/xinput/package.nix new file mode 100644 index 000000000000..e382442bdd42 --- /dev/null +++ b/pkgs/by-name/xi/xinput/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + xorgproto, + libx11, + libxext, + libxi, + libxinerama, + libxrandr, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xinput"; + version = "1.6.4"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "app"; + repo = "xinput"; + tag = "xinput-${finalAttrs.version}"; + hash = "sha256-EsSytLzwAHMwseW4pD/c+/J1MaCWPsE7RPoMIwT96yk="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + util-macros + ]; + + buildInputs = [ + xorgproto + libx11 + libxext + libxi + libxinerama + libxrandr + ]; + + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version-regex=xinput-(.*)" ]; }; + }; + + meta = { + description = "Utility to configure and test XInput devices"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xinput"; + license = with lib.licenses; [ + hpndSellVariant + mit + ]; + mainProgram = "xinput"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b62e8afb1f99..78643f2538d1 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -135,6 +135,7 @@ xgc, xhost, xinit, + xinput, xkbevd, xkbprint, xkbutils, @@ -223,6 +224,7 @@ self: with self; { xgc xhost xinit + xinput xkbevd xkbprint xkbutils @@ -2126,50 +2128,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xinput = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libX11, - libXext, - libXi, - libXinerama, - libXrandr, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xinput"; - version = "1.6.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xinput-1.6.4.tar.xz"; - sha256 = "1j2pf28c54apr56v1fmvprp657n6x4sdrv8f24rx3138cl6x015d"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libX11 - libXext - libXi - libXinerama - libXrandr - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xkbcomp = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 4d3895a46e2c..f90a8f5252d7 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -467,6 +467,7 @@ print OUT < Date: Fri, 12 Dec 2025 21:44:46 +0100 Subject: [PATCH 3/5] xwd: refactor & move to pkgs/by-name from xorg namespace relevant changes: - switch to GitLab source instead of release tarball --- pkgs/by-name/xw/xwd/package.nix | 53 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 13 ----- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 57 insertions(+), 52 deletions(-) create mode 100644 pkgs/by-name/xw/xwd/package.nix diff --git a/pkgs/by-name/xw/xwd/package.nix b/pkgs/by-name/xw/xwd/package.nix new file mode 100644 index 000000000000..0dc9ed5425ad --- /dev/null +++ b/pkgs/by-name/xw/xwd/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + libxkbfile, + libx11, + xorgproto, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xwd"; + version = "1.0.9"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "app"; + repo = "xwd"; + tag = "xwd-${finalAttrs.version}"; + hash = "sha256-cEKm0c50qwWzGSkH1sdovNfN3dW1hmnaEDwuJKwxGdo="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + util-macros + ]; + + buildInputs = [ + libxkbfile + libx11 + xorgproto + ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xwd-(.*)" ]; }; + + meta = { + description = "Utility to dump an image of an X window in XWD format"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xwd"; + license = with lib.licenses; [ + mitOpenGroup + hpndSellVariant + ]; + mainProgram = "xwd"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 78643f2538d1..5dc79021c38b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -166,6 +166,7 @@ xtrans, xvfb, xvinfo, + xwd, xwininfo, xwud, }: @@ -250,6 +251,7 @@ self: with self; { xtrans xvfb xvinfo + xwd xwininfo xwud ; @@ -2204,42 +2206,4 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xwd = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libxkbfile, - libX11, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xwd"; - version = "1.0.9"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xwd-1.0.9.tar.xz"; - sha256 = "0gxx3y9zlh13jgwkayxljm6i58ng8jc1xzqv2g8s7d3yjj21n4nw"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libxkbfile - libX11 - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - } diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index f90a8f5252d7..fdaad80937a1 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -498,6 +498,7 @@ print OUT < Date: Sat, 13 Dec 2025 15:06:42 +0100 Subject: [PATCH 4/5] xorg.{libXrap,xtrap}: drop --- pkgs/servers/x11/xorg/default.nix | 78 ----------------------------- pkgs/servers/x11/xorg/overrides.nix | 2 + pkgs/servers/x11/xorg/tarballs.list | 2 - 3 files changed, 2 insertions(+), 80 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 5dc79021c38b..8214510a6daf 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -344,46 +344,6 @@ self: with self; { xorgserver = xorg-server; xorgsgmldoctools = xorg-sgml-doctools; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libXTrap = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libX11, - libXext, - libXt, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libXTrap"; - version = "1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2"; - sha256 = "0bi5wxj6avim61yidh9fd3j4n8czxias5m8vss9vhxjnk1aksdwg"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libX11 - libXext - libXt - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xtrap" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xf86inputevdev = callPackage ( { @@ -2168,42 +2128,4 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xtrap = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libXt, - libXTrap, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xtrap"; - version = "1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2"; - sha256 = "0sqm4j1zflk1s94iq4waa70hna1xcys88v9a70w0vdw66czhvj2j"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - libXt - libXTrap - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - } diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 88d6934c8a18..a1a7565a5c2d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -378,6 +378,8 @@ self: super: # deprecate some packages // lib.optionalAttrs config.allowAliases { fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; # added 2025-09-24 + libXtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13 + xtrap = throw "XTrap was a proposed X11 extension that hasn't been in Xorg since X11R6 in 1994, it is deprecated and archived upstream."; # added 2025-12-13 xf86videoglide = throw "The Xorg Glide video driver has been archived upstream due to being obsolete"; # added 2025-12-13 xf86videoglint = throw '' The Xorg GLINT/Permedia video driver has been broken since xorg 21. diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 48a7c4d49414..84c515c34b26 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -1,5 +1,4 @@ mirror://xorg/individual/app/xkbcomp-1.5.0.tar.xz -mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz @@ -44,4 +43,3 @@ mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.1.tar.xz mirror://xorg/individual/driver/xf86-video-vesa-2.6.0.tar.xz mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz -mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 From e896fd011f1d128bd5bf622ddb5bd92daa793c32 Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Fri, 12 Dec 2025 22:52:46 +0100 Subject: [PATCH 5/5] xkbcomp: refactor & move to pkgs/by-name from xorg namespace relevant changes: - switch to GitLab source instead of release tarball --- pkgs/by-name/xk/xkbcomp/package.nix | 65 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +----------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 7 -- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 69 insertions(+), 46 deletions(-) create mode 100644 pkgs/by-name/xk/xkbcomp/package.nix diff --git a/pkgs/by-name/xk/xkbcomp/package.nix b/pkgs/by-name/xk/xkbcomp/package.nix new file mode 100644 index 000000000000..24cf1311e7b1 --- /dev/null +++ b/pkgs/by-name/xk/xkbcomp/package.nix @@ -0,0 +1,65 @@ +{ + lib, + stdenv, + fetchFromGitLab, + autoreconfHook, + pkg-config, + util-macros, + bison, + libx11, + libxkbfile, + xorgproto, + xkeyboard-config, + nix-update-script, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xkbcomp"; + version = "1.5.0"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "app"; + repo = "xkbcomp"; + tag = "xkbcomp-${finalAttrs.version}"; + hash = "sha256-nkyBjIOX9Qr0K+R0JcvJ7egI0a8Zh/tyhZvG7E+VlZU="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + util-macros + bison + ]; + + buildInputs = [ + util-macros # unused dependency but the build fails if pkg-config can't find it + libx11 + libxkbfile + xorgproto + ]; + + configureFlags = [ "--with-xkb-config-root=${xkeyboard-config}/share/X11/xkb" ]; + + passthru = { + updateScript = nix-update-script { extraArgs = [ "--version-regex=xkbcomp-(.*)" ]; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "XKB keyboard description compiler"; + homepage = "https://gitlab.freedesktop.org/xorg/app/xkbcomp"; + license = with lib.licenses; [ + hpnd + mitOpenGroup + hpndDec + ]; + mainProgram = "xkbcomp"; + maintainers = [ ]; + pkgConfigModules = [ "xkbcomp" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 8214510a6daf..6585dcb56a07 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -136,6 +136,7 @@ xhost, xinit, xinput, + xkbcomp, xkbevd, xkbprint, xkbutils, @@ -226,6 +227,7 @@ self: with self; { xhost xinit xinput + xkbcomp xkbevd xkbprint xkbutils @@ -2090,42 +2092,4 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - xkbcomp = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libxkbfile, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "xkbcomp"; - version = "1.5.0"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/xkbcomp-1.5.0.tar.xz"; - sha256 = "0q3092w42w9wyfr5zf3ymkmzlqr24z6kz6ypkinxnxh7c0k1zhra"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - libxkbfile - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xkbcomp" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - } diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index fdaad80937a1..4c0f28afa380 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -468,6 +468,7 @@ print OUT <