diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/x11')
-rw-r--r-- | nixpkgs/pkgs/servers/x11/xorg/default.nix | 30 | ||||
-rw-r--r-- | nixpkgs/pkgs/servers/x11/xorg/overrides.nix | 102 | ||||
-rw-r--r-- | nixpkgs/pkgs/servers/x11/xorg/tarballs.list | 10 |
3 files changed, 114 insertions, 28 deletions
diff --git a/nixpkgs/pkgs/servers/x11/xorg/default.nix b/nixpkgs/pkgs/servers/x11/xorg/default.nix index 8ce28251d4fc..fc19ad8d1301 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/default.nix +++ b/nixpkgs/pkgs/servers/x11/xorg/default.nix @@ -714,11 +714,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! fontutil = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { pname = "font-util"; - version = "1.4.0"; + version = "1.4.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/font/font-util-1.4.0.tar.xz"; - sha256 = "0z8gsi0bz5nnpsl008fyb4isrkrqrmhxjar5ywwpx30j83wlnwlz"; + url = "mirror://xorg/individual/font/font-util-1.4.1.tar.xz"; + sha256 = "15fcd3rzlgm51fwgfapg6vzyd1kkd28rj149xq7iajqr7h9697sw"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1439,11 +1439,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libpthreadstubs = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { pname = "libpthread-stubs"; - version = "0.4"; + version = "0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xcb/libpthread-stubs-0.4.tar.bz2"; - sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; + url = "mirror://xorg/individual/xcb/libpthread-stubs-0.5.tar.xz"; + sha256 = "1g224hyy694jch54357zc895z46r90xs193hg4m7rfnfxinmdnjr"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1455,11 +1455,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libxcb = callPackage ({ stdenv, pkg-config, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python3 }: stdenv.mkDerivation { pname = "libxcb"; - version = "1.15"; + version = "1.16"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libxcb-1.15.tar.xz"; - sha256 = "0nd035rf83xf531cnjzsf9ykb5w9rdzz6bbyhi683xkwh57p8f6c"; + url = "mirror://xorg/individual/lib/libxcb-1.16.tar.xz"; + sha256 = "0w8xf6ff6axvla734lfb2291hrjrqqhn6mqabvdrdwgvl1m5cj23"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1807,11 +1807,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcbproto = callPackage ({ stdenv, pkg-config, fetchurl, python3 }: stdenv.mkDerivation { pname = "xcb-proto"; - version = "1.15.2"; + version = "1.16.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/proto/xcb-proto-1.15.2.tar.xz"; - sha256 = "1vak6q53abwxnkfn6by7j24m48kd2iy7jnskkqzzx8l0ysqvwwkh"; + url = "mirror://xorg/individual/proto/xcb-proto-1.16.0.tar.xz"; + sha256 = "06aij66rs8g378wg8swd7b3g73wqrrbbwl8shhnsi29amm41hnm7"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2159,11 +2159,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { pname = "xf86-input-libinput"; - version = "1.3.0"; + version = "1.4.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-libinput-1.3.0.tar.xz"; - sha256 = "1fqsik2hdibz7zx7bb2rkh6wadz0p31xpd50ljsnij9bl8hblihl"; + url = "mirror://xorg/individual/driver/xf86-input-libinput-1.4.0.tar.xz"; + sha256 = "1673ydfrvfqd4inz3vx1qyxa0mhr0f4bi0r7mrcmpisxi76i8g9s"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index 2d15d5ea722a..2c168a659a89 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix @@ -18,6 +18,10 @@ let (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-malloc0returnsnull"; + addMainProgram = pkg: { mainProgram ? pkg.pname }: pkg.overrideAttrs (attrs: { + meta = attrs.meta // { inherit mainProgram; }; + }); + brokenOnDarwin = pkg: pkg.overrideAttrs (attrs: { meta = attrs.meta // { broken = isDarwin; }; }); @@ -42,12 +46,18 @@ self: super: postInstallHooks+=(wrapWithXFileSearchPath) '')) {}; + appres = addMainProgram super.appres { }; + bdftopcf = super.bdftopcf.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ]; + meta = attrs.meta // { mainProgram = "bdftopcf"; }; }); + bitmap = addMainProgram super.bitmap { }; + editres = super.editres.overrideAttrs (attrs: { hardeningDisable = [ "format" ]; + meta = attrs.meta // { mainProgram = "editres"; }; }); fontmiscmisc = super.fontmiscmisc.overrideAttrs (attrs: { @@ -60,9 +70,16 @@ self: super: }); fonttosfnt = super.fonttosfnt.overrideAttrs (attrs: { - meta = attrs.meta // { license = lib.licenses.mit; }; + meta = attrs.meta // { + license = lib.licenses.mit; + mainProgram = "fonttosfnt"; + }; }); + gccmakedep = addMainProgram super.gccmakedep { }; + iceauth = addMainProgram super.iceauth { }; + ico = addMainProgram super.ico { }; + imake = super.imake.overrideAttrs (attrs: { inherit (xorg) xorgcffiles; x11BuildHook = ./imake.sh; @@ -75,6 +92,8 @@ self: super: configureFlags = attrs.configureFlags or [] ++ [ "ac_cv_path_RAWCPP=${stdenv.cc.targetPrefix}cpp" ]; inherit tradcpp; + + meta = attrs.meta // { mainProgram = "imake"; }; }); mkfontdir = xorg.mkfontscale; @@ -116,6 +135,8 @@ self: super: }; }); + libxcvt = addMainProgram super.libxcvt { mainProgram = "cvt"; }; + libX11 = super.libX11.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" ]; configureFlags = attrs.configureFlags or [] @@ -193,6 +214,9 @@ self: super: configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; }); + + listres = addMainProgram super.listres { }; + xdpyinfo = super.xdpyinfo.overrideAttrs (attrs: { configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; @@ -213,6 +237,7 @@ self: super: ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) # checking for /dev/urandom... configure: error: cannot check for file existence when cross compiling [ "ac_cv_file__dev_urandom=true" "ac_cv_file__dev_random=true" ]; + meta = attrs.meta // { mainProgram = "xdm"; }; }); # Propagate some build inputs because of header file dependencies. @@ -237,6 +262,7 @@ self: super: configureFlags = [ "--disable-selective-werror" ]; buildInputs = attrs.buildInputs ++ [libiconv]; + meta = attrs.meta // { mainProgram = "luit"; }; }); libICE = super.libICE.overrideAttrs (attrs: { @@ -359,6 +385,7 @@ self: super: outputs = [ "bin" "dev" "out" ]; # tiny man in $bin patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; XPM_PATH_COMPRESS = lib.makeBinPath [ ncompress ]; + meta = attrs.meta // { mainProgram = "sxpm"; }; }); libXpresent = super.libXpresent.overrideAttrs (attrs: { @@ -402,16 +429,28 @@ self: super: ln -sfn ${xorg.xkeyboardconfig}/etc/X11 $out/share/X11 ln -sfn ${xorg.xkeyboardconfig}/share/man/man7/xkeyboard-config.7.gz $out/share/man/man7 ''; + meta = attrs.meta // { mainProgram = "setxkbmap"; }; }); + makedepend = addMainProgram super.makedepend { }; + mkfontscale = addMainProgram super.mkfontscale { }; + oclock = addMainProgram super.oclock { }; + smproxy = addMainProgram super.smproxy { }; + transset = addMainProgram super.transset { }; + utilmacros = super.utilmacros.overrideAttrs (attrs: { # not needed for releases, we propagate the needed tools propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ automake autoconf libtool ]; }); + viewres = addMainProgram super.viewres { }; + x11perf = super.x11perf.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [ freetype fontconfig ]; + meta = attrs.meta // { mainProgram = "x11perf"; }; }); + xcalc = addMainProgram super.xcalc { }; + xcbutil = super.xcbutil.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; }); @@ -579,14 +618,20 @@ self: super: xdriinfo = super.xdriinfo.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [libGL]; + meta = attrs.meta // { mainProgram = "xdriinfo"; }; }); + xev = addMainProgram super.xev { }; + xeyes = addMainProgram super.xeyes { }; + xvinfo = super.xvinfo.overrideAttrs (attrs: { buildInputs = attrs.buildInputs ++ [xorg.libXext]; + meta = attrs.meta // { mainProgram = "xvinfo"; }; }); xkbcomp = super.xkbcomp.overrideAttrs (attrs: { configureFlags = [ "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb" ]; + meta = attrs.meta // { mainProgram = "xkbcomp"; }; }); xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: { @@ -670,7 +715,10 @@ self: super: }); xlsfonts = super.xlsfonts.overrideAttrs (attrs: { - meta = attrs.meta // { license = lib.licenses.mit; }; + meta = attrs.meta // { + license = lib.licenses.mit; + mainProgram = "xlsfonts"; + }; }); xorgproto = super.xorgproto.overrideAttrs (attrs: { @@ -704,6 +752,7 @@ self: super: sed -i -e "s|#include <drm_fourcc.h>|#include <libdrm/drm_fourcc.h>|" $i done ''; + meta = attrs_passed.meta // { mainProgram = "X"; }; } else throw "unsupported xorg abiCompat ${abiCompat} for ${attrs_passed.name}"; @@ -870,11 +919,12 @@ self: super: --replace '_X_NORETURN' '__attribute__((noreturn))' \ --replace 'n_dirs--;' "" ''; - meta.mainProgram = "lndir"; + meta = attrs.meta // { mainProgram = "lndir"; }; }); twm = super.twm.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [bison flex]; + meta = attrs.meta // { mainProgram = "twm"; }; }); xauth = super.xauth.overrideAttrs (attrs: { @@ -884,8 +934,16 @@ self: super: + lib.optionalString stdenv.hostPlatform.isStatic '' export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lxcb -lXau -lXdmcp" ''; + meta = attrs.meta // { mainProgram = "xauth"; }; }); + xbacklight = addMainProgram super.xbacklight { }; + xclock = addMainProgram super.xclock { }; + xcmsdb = addMainProgram super.xcmsdb { }; + xcompmgr = addMainProgram super.xcompmgr { }; + xconsole = addMainProgram super.xconsole { }; + xcursorgen = addMainProgram super.xcursorgen { }; + xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: { nativeBuildInputs = attrs.nativeBuildInputs ++ [ xorg.xcursorgen ]; buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ]; @@ -915,6 +973,7 @@ self: super: --replace $out/etc/X11/xinit/xserverrc /etc/X11/xinit/xserverrc \ --replace $out/etc/X11/xinit/xinitrc /etc/X11/xinit/xinitrc ''; + meta = attrs.meta // { mainProgram = "xinit"; }; }); xf86videointel = super.xf86videointel.overrideAttrs (attrs: { @@ -971,6 +1030,25 @@ self: super: ]; }); + xfd = addMainProgram super.xfd { }; + xfontsel = addMainProgram super.xfontsel { }; + xfs = addMainProgram super.xfs { }; + xfsinfo = addMainProgram super.xfsinfo { }; + xgamma = addMainProgram super.xgamma { }; + xgc = addMainProgram super.xgc { }; + xhost = addMainProgram super.xhost { }; + xinput = addMainProgram super.xinput { }; + xkbevd = addMainProgram super.xkbevd { }; + xkbprint = addMainProgram super.xkbprint { }; + xkill = addMainProgram super.xkill { }; + xload = addMainProgram super.xload { }; + xlsatoms = addMainProgram super.xlsatoms { }; + xlsclients = addMainProgram super.xlsclients { }; + xmag = addMainProgram super.xmag { }; + xmessage = addMainProgram super.xmessage { }; + xmodmap = addMainProgram super.xmodmap { }; + xmore = addMainProgram super.xmore { }; + xorgcffiles = super.xorgcffiles.overrideAttrs (attrs: { postInstall = lib.optionalString stdenv.isDarwin '' substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" "" @@ -983,12 +1061,17 @@ self: super: postInstall = "mkdir $out/bin"; }); + xpr = addMainProgram super.xpr { }; + xprop = addMainProgram super.xprop { }; + xrdb = super.xrdb.overrideAttrs (attrs: { configureFlags = [ "--with-cpp=${mcpp}/bin/mcpp" ]; + meta = attrs.meta // { mainProgram = "xrdb"; }; }); sessreg = super.sessreg.overrideAttrs (attrs: { preBuild = "sed -i 's|gcc -E|gcc -E -P|' man/Makefile"; + meta = attrs.meta // { mainProgram = "sessreg"; }; }); xrandr = super.xrandr.overrideAttrs (attrs: { @@ -1000,11 +1083,14 @@ self: super: }; }); - xset = super.xset.overrideAttrs (attrs: { - meta = attrs.meta // { - mainProgram = "xset"; - }; - }); + xrefresh = addMainProgram super.xrefresh { }; + xset = addMainProgram super.xset { }; + xsetroot = addMainProgram super.xsetroot { }; + xsm = addMainProgram super.xsm { }; + xstdcmap = addMainProgram super.xstdcmap { }; + xwd = addMainProgram super.xwd { }; + xwininfo = addMainProgram super.xwininfo { }; + xwud = addMainProgram super.xwud { }; # convert Type1 vector fonts to OpenType fonts fontbitstreamtype1 = super.fontbitstreamtype1.overrideAttrs (attrs: { diff --git a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list index 45ce4833a13b..953711d70bc8 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list +++ b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list @@ -1,5 +1,5 @@ https://invisible-mirror.net/archives/luit/luit-20190106.tgz -mirror://xorg/individual/xcb/libpthread-stubs-0.4.tar.bz2 +mirror://xorg/individual/xcb/libpthread-stubs-0.5.tar.xz mirror://xorg/individual/xcb/xcb-util-0.4.1.tar.xz mirror://xorg/individual/xcb/xcb-util-cursor-0.1.4.tar.xz mirror://xorg/individual/xcb/xcb-util-errors-1.0.1.tar.xz @@ -80,7 +80,7 @@ mirror://xorg/individual/doc/xorg-sgml-doctools-1.12.tar.gz mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz mirror://xorg/individual/driver/xf86-input-keyboard-2.0.0.tar.xz -mirror://xorg/individual/driver/xf86-input-libinput-1.3.0.tar.xz +mirror://xorg/individual/driver/xf86-input-libinput-1.4.0.tar.xz mirror://xorg/individual/driver/xf86-input-mouse-1.9.5.tar.xz mirror://xorg/individual/driver/xf86-input-synaptics-1.9.2.tar.xz mirror://xorg/individual/driver/xf86-input-vmmouse-13.2.0.tar.xz @@ -163,7 +163,7 @@ mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz -mirror://xorg/individual/font/font-util-1.4.0.tar.xz +mirror://xorg/individual/font/font-util-1.4.1.tar.xz mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2 @@ -177,7 +177,7 @@ mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.8.6.tar.xz mirror://xorg/individual/lib/libXau-1.0.11.tar.xz mirror://xorg/individual/lib/libXaw-1.0.15.tar.xz -mirror://xorg/individual/lib/libxcb-1.15.tar.xz +mirror://xorg/individual/lib/libxcb-1.16.tar.xz mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz mirror://xorg/individual/lib/libXcursor-1.2.1.tar.xz mirror://xorg/individual/lib/libxcvt-0.1.2.tar.xz @@ -209,7 +209,7 @@ mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.5.tar.xz mirror://xorg/individual/lib/xtrans-1.5.0.tar.xz -mirror://xorg/individual/proto/xcb-proto-1.15.2.tar.xz +mirror://xorg/individual/proto/xcb-proto-1.16.0.tar.xz mirror://xorg/individual/proto/xorgproto-2023.2.tar.xz mirror://xorg/individual/util/bdftopcf-1.1.1.tar.xz mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 |