x{cursor{gen,-themes},ev,fsinfo,randr,vinfo}: refactor and move to pkgs/by-name from xorg namespace (#435457)

authored by jopejoe1 and committed by GitHub 8e04e5dd b95ac8a9

+346 -255
+49
pkgs/by-name/xc/xcursor-themes/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xcursorgen, 7 + xorgproto, 8 + libxcursor, 9 + writeScript, 10 + }: 11 + stdenv.mkDerivation (finalAttrs: { 12 + pname = "xcursor-themes"; 13 + version = "1.0.7"; 14 + 15 + src = fetchurl { 16 + url = "mirror://xorg/individual/data/xcursor-themes-${finalAttrs.version}.tar.xz"; 17 + hash = "sha256-lbro9Igj2JSgW/Qt+/RTZ0q3296xHivAeehSWtRzeMg="; 18 + }; 19 + 20 + strictDeps = true; 21 + nativeBuildInputs = [ 22 + pkg-config 23 + xcursorgen 24 + ]; 25 + buildInputs = [ 26 + xorgproto 27 + libxcursor 28 + ]; 29 + 30 + configureFlags = [ "--with-cursordir=$(out)/share/icons" ]; 31 + passthru = { 32 + updateScript = writeScript "update-${finalAttrs.pname}" '' 33 + #!/usr/bin/env nix-shell 34 + #!nix-shell -i bash -p common-updater-scripts 35 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 36 + --url https://xorg.freedesktop.org/releases/individual/data/ \ 37 + | sort -V | tail -n1)" 38 + update-source-version ${finalAttrs.pname} "$version" 39 + ''; 40 + }; 41 + 42 + meta = { 43 + description = "Default set of cursor themes for use with libXcursor."; 44 + homepage = "https://gitlab.freedesktop.org/xorg/data/cursors"; 45 + license = lib.licenses.x11; 46 + maintainers = [ ]; 47 + platforms = lib.platforms.unix; 48 + }; 49 + })
+51
pkgs/by-name/xc/xcursorgen/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + libpng, 7 + libx11, 8 + libxcursor, 9 + xorgproto, 10 + writeScript, 11 + }: 12 + stdenv.mkDerivation (finalAttrs: { 13 + pname = "xcursorgen"; 14 + version = "1.0.9"; 15 + 16 + src = fetchurl { 17 + url = "mirror://xorg/individual/app/xcursorgen-${finalAttrs.version}.tar.xz"; 18 + hash = "sha256-DMnhVqyEyhbqkCcQrzXg+v+lHRN5cHHjtLbMfL1JO7w="; 19 + }; 20 + 21 + strictDeps = true; 22 + 23 + nativeBuildInputs = [ pkg-config ]; 24 + 25 + buildInputs = [ 26 + libpng 27 + libx11 28 + libxcursor 29 + xorgproto 30 + ]; 31 + 32 + passthru = { 33 + updateScript = writeScript "update-${finalAttrs.pname}" '' 34 + #!/usr/bin/env nix-shell 35 + #!nix-shell -i bash -p common-updater-scripts 36 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 37 + --url https://xorg.freedesktop.org/releases/individual/app/ \ 38 + | sort -V | tail -n1)" 39 + update-source-version ${finalAttrs.pname} "$version" 40 + ''; 41 + }; 42 + 43 + meta = { 44 + description = "prepares X11 cursor sets for use with libXcursor"; 45 + homepage = "https://gitlab.freedesktop.org/xorg/app/xcursorgen"; 46 + license = lib.licenses.hpndSellVariant; 47 + mainProgram = "xcursorgen"; 48 + maintainers = [ ]; 49 + platforms = lib.platforms.unix; 50 + }; 51 + })
+54
pkgs/by-name/xe/xev/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + libx11, 8 + libxrandr, 9 + writeScript, 10 + }: 11 + stdenv.mkDerivation (finalAttrs: { 12 + pname = "xev"; 13 + version = "1.2.6"; 14 + 15 + src = fetchurl { 16 + url = "mirror://xorg/individual/app/xev-${finalAttrs.version}.tar.xz"; 17 + hash = "sha256-YeHF4AismXOsp83d826d90EOdwg7Aw6wT03HN8UYB9c="; 18 + }; 19 + 20 + strictDeps = true; 21 + nativeBuildInputs = [ pkg-config ]; 22 + buildInputs = [ 23 + xorgproto 24 + libx11 25 + libxrandr 26 + ]; 27 + 28 + passthru = { 29 + updateScript = writeScript "update-${finalAttrs.pname}" '' 30 + #!/usr/bin/env nix-shell 31 + #!nix-shell -i bash -p common-updater-scripts 32 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 33 + --url https://xorg.freedesktop.org/releases/individual/app/ \ 34 + | sort -V | tail -n1)" 35 + update-source-version ${finalAttrs.pname} "$version" 36 + ''; 37 + }; 38 + 39 + meta = { 40 + description = "X event monitor"; 41 + longDescription = '' 42 + xev creates a window and then asks the X server to send it X11 events whenever anything 43 + happens to the window (such as it being moved, resized, typed in, clicked in, etc.). 44 + You can also attach it to an existing window. It is useful for seeing what causes events to 45 + occur and to display the information that they contain; it is essentially a debugging and 46 + development tool, and should not be needed in normal usage. 47 + ''; 48 + homepage = "https://gitlab.freedesktop.org/xorg/app/xev"; 49 + license = lib.licenses.x11; 50 + mainProgram = "xev"; 51 + maintainers = [ ]; 52 + platforms = lib.platforms.unix; 53 + }; 54 + })
+56
pkgs/by-name/xf/xfsinfo/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + libfs, 8 + writeScript, 9 + }: 10 + stdenv.mkDerivation (finalAttrs: { 11 + pname = "xfsinfo"; 12 + version = "1.0.8"; 13 + 14 + src = fetchurl { 15 + url = "mirror://xorg/individual/app/xfsinfo-${finalAttrs.version}.tar.xz"; 16 + hash = "sha256-roBZK2Bj2pKOPQyBAjcJsvopoE/NpJ9sNjrFedl/I6I="; 17 + }; 18 + 19 + strictDeps = true; 20 + 21 + nativeBuildInputs = [ pkg-config ]; 22 + 23 + buildInputs = [ 24 + xorgproto 25 + libfs 26 + ]; 27 + 28 + passthru = { 29 + updateScript = writeScript "update-${finalAttrs.pname}" '' 30 + #!/usr/bin/env nix-shell 31 + #!nix-shell -i bash -p common-updater-scripts 32 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 33 + --url https://xorg.freedesktop.org/releases/individual/app/ \ 34 + | sort -V | tail -n1)" 35 + update-source-version ${finalAttrs.pname} "$version" 36 + ''; 37 + }; 38 + 39 + meta = { 40 + description = "X font server information utility"; 41 + longDescription = '' 42 + xfsinfo is a utility for displaying information about an X font server. 43 + It is used to examine the capabilities of a server, the predefined values for various 44 + parameters used in communicating between clients and the server, and the font catalogues and 45 + alternate servers that are available. 46 + ''; 47 + homepage = "https://gitlab.freedesktop.org/xorg/app/xfsinfo"; 48 + license = with lib.licenses; [ 49 + mitOpenGroup 50 + hpndSellVariant 51 + ]; 52 + mainProgram = "xfsinfo"; 53 + maintainers = [ ]; 54 + platforms = lib.platforms.unix; 55 + }; 56 + })
+57
pkgs/by-name/xr/xrandr/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + libx11, 8 + libxrandr, 9 + libxrender, 10 + writeScript, 11 + }: 12 + stdenv.mkDerivation (finalAttrs: { 13 + pname = "xrandr"; 14 + version = "1.5.3"; 15 + 16 + src = fetchurl { 17 + url = "mirror://xorg/individual/app/xrandr-${finalAttrs.version}.tar.xz"; 18 + hash = "sha256-+N11Zq23QUf6uZZGgLa7re6Hz0Bqf8/1Fxil5pSbhBw="; 19 + }; 20 + 21 + strictDeps = true; 22 + 23 + nativeBuildInputs = [ pkg-config ]; 24 + 25 + buildInputs = [ 26 + xorgproto 27 + libx11 28 + libxrandr 29 + libxrender 30 + ]; 31 + 32 + postInstall = '' 33 + # remove useless xkeystone script 34 + # it is written in a language not packaged in nixpkgs 35 + rm $out/bin/xkeystone 36 + ''; 37 + 38 + passthru = { 39 + updateScript = writeScript "update-${finalAttrs.pname}" '' 40 + #!/usr/bin/env nix-shell 41 + #!nix-shell -i bash -p common-updater-scripts 42 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 43 + --url https://xorg.freedesktop.org/releases/individual/app/ \ 44 + | sort -V | tail -n1)" 45 + update-source-version ${finalAttrs.pname} "$version" 46 + ''; 47 + }; 48 + 49 + meta = { 50 + description = "Command line interface to X11 Resize, Rotate, and Reflect (RandR) extension"; 51 + homepage = "https://gitlab.freedesktop.org/xorg/app/xrandr"; 52 + license = lib.licenses.hpndSellVariant; 53 + mainProgram = "xrandr"; 54 + maintainers = [ ]; 55 + platforms = lib.platforms.unix; 56 + }; 57 + })
+55
pkgs/by-name/xv/xvinfo/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + libx11, 8 + libxv, 9 + libxext, 10 + writeScript, 11 + }: 12 + stdenv.mkDerivation (finalAttrs: { 13 + pname = "xvinfo"; 14 + version = "1.1.5"; 15 + 16 + src = fetchurl { 17 + url = "mirror://xorg/individual/app/xvinfo-${finalAttrs.version}.tar.xz"; 18 + hash = "sha256-Pt5x7LJtlhTMvGkWcgKF6VosfgxeGbhXDqr3KtfFxAQ="; 19 + }; 20 + 21 + strictDeps = true; 22 + 23 + nativeBuildInputs = [ pkg-config ]; 24 + 25 + buildInputs = [ 26 + xorgproto 27 + libx11 28 + libxv 29 + libxext 30 + ]; 31 + 32 + passthru = { 33 + updateScript = writeScript "update-${finalAttrs.pname}" '' 34 + #!/usr/bin/env nix-shell 35 + #!nix-shell -i bash -p common-updater-scripts 36 + version="$(list-directory-versions --pname ${finalAttrs.pname} \ 37 + --url https://xorg.freedesktop.org/releases/individual/app/ \ 38 + | sort -V | tail -n1)" 39 + update-source-version ${finalAttrs.pname} "$version" 40 + ''; 41 + }; 42 + 43 + meta = { 44 + description = "Utility to print out X-Video extension adaptor information"; 45 + longDescription = '' 46 + xvinfo prints out the capabilities of any video adaptors associated with the display that are 47 + accessible through the X-Video extension. 48 + ''; 49 + homepage = "https://gitlab.freedesktop.org/xorg/app/xvinfo"; 50 + license = lib.licenses.x11; 51 + mainProgram = "xvinfo"; 52 + maintainers = [ ]; 53 + platforms = lib.platforms.unix; 54 + }; 55 + })
+12 -224
pkgs/servers/x11/xorg/default.nix
··· 55 55 xbitmaps, 56 56 xcb-proto, 57 57 xcmsdb, 58 + xcursorgen, 59 + xcursor-themes, 58 60 xdriinfo, 61 + xev, 62 + xfsinfo, 59 63 xkeyboard-config, 60 64 xlsatoms, 61 65 xlsclients, ··· 66 70 xorgproto, 67 71 xorg-sgml-doctools, 68 72 xprop, 73 + xrandr, 69 74 xrefresh, 70 75 xtrans, 76 + xvinfo, 71 77 xwininfo, 72 78 xwud, 73 79 }: ··· 93 99 transset 94 100 xbitmaps 95 101 xcmsdb 102 + xcursorgen 96 103 xdriinfo 104 + xev 105 + xfsinfo 97 106 xlsatoms 98 107 xlsclients 99 108 xlsfonts 100 109 xmodmap 101 110 xorgproto 102 111 xprop 112 + xrandr 103 113 xrefresh 104 114 xtrans 115 + xvinfo 105 116 xwininfo 106 117 xwud 107 118 ; ··· 142 153 xcbutilrenderutil = libxcb-render-util; 143 154 xcbutilwm = libxcb-wm; 144 155 xkeyboardconfig = xkeyboard-config; 156 + xcursorthemes = xcursor-themes; 145 157 xorgcffiles = xorg-cf-files; 146 158 xorgdocs = xorg-docs; 147 159 xorgsgmldoctools = xorg-sgml-doctools; ··· 2865 2877 ) { }; 2866 2878 2867 2879 # THIS IS A GENERATED FILE. DO NOT EDIT! 2868 - xcursorgen = callPackage ( 2869 - { 2870 - stdenv, 2871 - pkg-config, 2872 - fetchurl, 2873 - libpng, 2874 - libX11, 2875 - libXcursor, 2876 - xorgproto, 2877 - testers, 2878 - }: 2879 - stdenv.mkDerivation (finalAttrs: { 2880 - pname = "xcursorgen"; 2881 - version = "1.0.9"; 2882 - builder = ./builder.sh; 2883 - src = fetchurl { 2884 - url = "mirror://xorg/individual/app/xcursorgen-1.0.9.tar.xz"; 2885 - sha256 = "1g1v96yprk5nnkip2w3r2cfsbzzsw0ssy417j3m1djl4mibf3j8c"; 2886 - }; 2887 - hardeningDisable = [ 2888 - "bindnow" 2889 - "relro" 2890 - ]; 2891 - strictDeps = true; 2892 - nativeBuildInputs = [ pkg-config ]; 2893 - buildInputs = [ 2894 - libpng 2895 - libX11 2896 - libXcursor 2897 - xorgproto 2898 - ]; 2899 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2900 - meta = { 2901 - pkgConfigModules = [ ]; 2902 - platforms = lib.platforms.unix; 2903 - }; 2904 - }) 2905 - ) { }; 2906 - 2907 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2908 - xcursorthemes = callPackage ( 2909 - { 2910 - stdenv, 2911 - pkg-config, 2912 - fetchurl, 2913 - libXcursor, 2914 - testers, 2915 - }: 2916 - stdenv.mkDerivation (finalAttrs: { 2917 - pname = "xcursor-themes"; 2918 - version = "1.0.7"; 2919 - builder = ./builder.sh; 2920 - src = fetchurl { 2921 - url = "mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz"; 2922 - sha256 = "1j3qfga5llp8g702n7mivvdvfjk7agsgnbglbfh99n13i3sfiflm"; 2923 - }; 2924 - hardeningDisable = [ 2925 - "bindnow" 2926 - "relro" 2927 - ]; 2928 - strictDeps = true; 2929 - nativeBuildInputs = [ pkg-config ]; 2930 - buildInputs = [ libXcursor ]; 2931 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2932 - meta = { 2933 - pkgConfigModules = [ ]; 2934 - platforms = lib.platforms.unix; 2935 - }; 2936 - }) 2937 - ) { }; 2938 - 2939 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2940 2880 xdm = callPackage ( 2941 2881 { 2942 2882 stdenv, ··· 3055 2995 ) { }; 3056 2996 3057 2997 # THIS IS A GENERATED FILE. DO NOT EDIT! 3058 - xev = callPackage ( 3059 - { 3060 - stdenv, 3061 - pkg-config, 3062 - fetchurl, 3063 - libX11, 3064 - xorgproto, 3065 - libXrandr, 3066 - testers, 3067 - }: 3068 - stdenv.mkDerivation (finalAttrs: { 3069 - pname = "xev"; 3070 - version = "1.2.6"; 3071 - builder = ./builder.sh; 3072 - src = fetchurl { 3073 - url = "mirror://xorg/individual/app/xev-1.2.6.tar.xz"; 3074 - sha256 = "1mq7332kgisd9yq0w0rv11vhwhgpkmpg7pfdlyn776dc13hcbqb1"; 3075 - }; 3076 - hardeningDisable = [ 3077 - "bindnow" 3078 - "relro" 3079 - ]; 3080 - strictDeps = true; 3081 - nativeBuildInputs = [ pkg-config ]; 3082 - buildInputs = [ 3083 - libX11 3084 - xorgproto 3085 - libXrandr 3086 - ]; 3087 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3088 - meta = { 3089 - pkgConfigModules = [ ]; 3090 - platforms = lib.platforms.unix; 3091 - }; 3092 - }) 3093 - ) { }; 3094 - 3095 - # THIS IS A GENERATED FILE. DO NOT EDIT! 3096 2998 xeyes = callPackage ( 3097 2999 { 3098 3000 stdenv, ··· 5211 5113 ) { }; 5212 5114 5213 5115 # THIS IS A GENERATED FILE. DO NOT EDIT! 5214 - xfsinfo = callPackage ( 5215 - { 5216 - stdenv, 5217 - pkg-config, 5218 - fetchurl, 5219 - libFS, 5220 - xorgproto, 5221 - testers, 5222 - }: 5223 - stdenv.mkDerivation (finalAttrs: { 5224 - pname = "xfsinfo"; 5225 - version = "1.0.7"; 5226 - builder = ./builder.sh; 5227 - src = fetchurl { 5228 - url = "mirror://xorg/individual/app/xfsinfo-1.0.7.tar.xz"; 5229 - sha256 = "0x48p4hk0lds2s8nwzgfl616r99s28ydx02zs7p1fxxs3i2wmwwj"; 5230 - }; 5231 - hardeningDisable = [ 5232 - "bindnow" 5233 - "relro" 5234 - ]; 5235 - strictDeps = true; 5236 - nativeBuildInputs = [ pkg-config ]; 5237 - buildInputs = [ 5238 - libFS 5239 - xorgproto 5240 - ]; 5241 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 5242 - meta = { 5243 - pkgConfigModules = [ ]; 5244 - platforms = lib.platforms.unix; 5245 - }; 5246 - }) 5247 - ) { }; 5248 - 5249 - # THIS IS A GENERATED FILE. DO NOT EDIT! 5250 5116 xgamma = callPackage ( 5251 5117 { 5252 5118 stdenv, ··· 5911 5777 ) { }; 5912 5778 5913 5779 # THIS IS A GENERATED FILE. DO NOT EDIT! 5914 - xrandr = callPackage ( 5915 - { 5916 - stdenv, 5917 - pkg-config, 5918 - fetchurl, 5919 - libX11, 5920 - xorgproto, 5921 - libXrandr, 5922 - libXrender, 5923 - testers, 5924 - }: 5925 - stdenv.mkDerivation (finalAttrs: { 5926 - pname = "xrandr"; 5927 - version = "1.5.3"; 5928 - builder = ./builder.sh; 5929 - src = fetchurl { 5930 - url = "mirror://xorg/individual/app/xrandr-1.5.3.tar.xz"; 5931 - sha256 = "0744kfafd98q2zswyzva837qgvmdpfv80ilnp7x4fhdpmmk7bpgq"; 5932 - }; 5933 - hardeningDisable = [ 5934 - "bindnow" 5935 - "relro" 5936 - ]; 5937 - strictDeps = true; 5938 - nativeBuildInputs = [ pkg-config ]; 5939 - buildInputs = [ 5940 - libX11 5941 - xorgproto 5942 - libXrandr 5943 - libXrender 5944 - ]; 5945 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 5946 - meta = { 5947 - pkgConfigModules = [ ]; 5948 - platforms = lib.platforms.unix; 5949 - }; 5950 - }) 5951 - ) { }; 5952 - 5953 - # THIS IS A GENERATED FILE. DO NOT EDIT! 5954 5780 xrdb = callPackage ( 5955 5781 { 5956 5782 stdenv, ··· 6187 6013 libX11 6188 6014 libXt 6189 6015 libXTrap 6190 - ]; 6191 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 6192 - meta = { 6193 - pkgConfigModules = [ ]; 6194 - platforms = lib.platforms.unix; 6195 - }; 6196 - }) 6197 - ) { }; 6198 - 6199 - # THIS IS A GENERATED FILE. DO NOT EDIT! 6200 - xvinfo = callPackage ( 6201 - { 6202 - stdenv, 6203 - pkg-config, 6204 - fetchurl, 6205 - libX11, 6206 - xorgproto, 6207 - libXv, 6208 - testers, 6209 - }: 6210 - stdenv.mkDerivation (finalAttrs: { 6211 - pname = "xvinfo"; 6212 - version = "1.1.5"; 6213 - builder = ./builder.sh; 6214 - src = fetchurl { 6215 - url = "mirror://xorg/individual/app/xvinfo-1.1.5.tar.xz"; 6216 - sha256 = "0164qpbjmxxa1rbvh6ay1iz2qnp9hl1745k9pk6195kdnbn73piy"; 6217 - }; 6218 - hardeningDisable = [ 6219 - "bindnow" 6220 - "relro" 6221 - ]; 6222 - strictDeps = true; 6223 - nativeBuildInputs = [ pkg-config ]; 6224 - buildInputs = [ 6225 - libX11 6226 - xorgproto 6227 - libXv 6228 6016 ]; 6229 6017 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 6230 6018 meta = {
+12
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 371 371 xbitmaps, 372 372 xcb-proto, 373 373 xcmsdb, 374 + xcursorgen, 375 + xcursor-themes, 374 376 xdriinfo, 377 + xev, 378 + xfsinfo, 375 379 xkeyboard-config, 376 380 xlsatoms, 377 381 xlsclients, ··· 382 386 xorgproto, 383 387 xorg-sgml-doctools, 384 388 xprop, 389 + xrandr, 385 390 xrefresh, 386 391 xtrans, 392 + xvinfo, 387 393 xwininfo, 388 394 xwud, 389 395 }: ··· 409 415 transset 410 416 xbitmaps 411 417 xcmsdb 418 + xcursorgen 412 419 xdriinfo 420 + xev 421 + xfsinfo 413 422 xlsatoms 414 423 xlsclients 415 424 xlsfonts 416 425 xmodmap 417 426 xorgproto 418 427 xprop 428 + xrandr 419 429 xrefresh 420 430 xtrans 431 + xvinfo 421 432 xwininfo 422 433 xwud 423 434 ; ··· 458 469 xcbutilrenderutil = libxcb-render-util; 459 470 xcbutilwm = libxcb-wm; 460 471 xkeyboardconfig = xkeyboard-config; 472 + xcursorthemes = xcursor-themes; 461 473 xorgcffiles = xorg-cf-files; 462 474 xorgdocs = xorg-docs; 463 475 xorgsgmldoctools = xorg-sgml-doctools;
-25
pkgs/servers/x11/xorg/overrides.nix
··· 543 543 }; 544 544 }); 545 545 546 - xev = addMainProgram super.xev { }; 547 546 xeyes = addMainProgram super.xeyes { }; 548 - 549 - xvinfo = super.xvinfo.overrideAttrs (attrs: { 550 - buildInputs = attrs.buildInputs ++ [ xorg.libXext ]; 551 - meta = attrs.meta // { 552 - mainProgram = "xvinfo"; 553 - }; 554 - }); 555 547 556 548 xkbcomp = super.xkbcomp.overrideAttrs (attrs: { 557 549 configureFlags = [ "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb" ]; ··· 886 878 xclock = addMainProgram super.xclock { }; 887 879 xcompmgr = addMainProgram super.xcompmgr { }; 888 880 xconsole = addMainProgram super.xconsole { }; 889 - xcursorgen = addMainProgram super.xcursorgen { }; 890 - 891 - xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: { 892 - nativeBuildInputs = attrs.nativeBuildInputs ++ [ xorg.xcursorgen ]; 893 - buildInputs = attrs.buildInputs ++ [ xorg.xorgproto ]; 894 - configureFlags = [ "--with-cursordir=$(out)/share/icons" ]; 895 - }); 896 881 897 882 xinit = 898 883 (super.xinit.override { ··· 980 965 xfd = addMainProgram super.xfd { }; 981 966 xfontsel = addMainProgram super.xfontsel { }; 982 967 xfs = addMainProgram super.xfs { }; 983 - xfsinfo = addMainProgram super.xfsinfo { }; 984 968 xgamma = addMainProgram super.xgamma { }; 985 969 xgc = addMainProgram super.xgc { }; 986 970 xhost = addMainProgram super.xhost { }; ··· 999 983 configureFlags = [ "--with-cpp=${mcpp}/bin/mcpp" ]; 1000 984 meta = attrs.meta // { 1001 985 mainProgram = "xrdb"; 1002 - }; 1003 - }); 1004 - 1005 - xrandr = super.xrandr.overrideAttrs (attrs: { 1006 - postInstall = '' 1007 - rm $out/bin/xkeystone 1008 - ''; 1009 - meta = attrs.meta // { 1010 - mainProgram = "xrandr"; 1011 986 }; 1012 987 }); 1013 988
-6
pkgs/servers/x11/xorg/tarballs.list
··· 16 16 mirror://xorg/individual/app/xclock-1.1.1.tar.xz 17 17 mirror://xorg/individual/app/xcompmgr-1.1.10.tar.xz 18 18 mirror://xorg/individual/app/xconsole-1.1.0.tar.xz 19 - mirror://xorg/individual/app/xcursorgen-1.0.9.tar.xz 20 19 mirror://xorg/individual/app/xdm-1.1.17.tar.xz 21 20 mirror://xorg/individual/app/xdpyinfo-1.3.4.tar.xz 22 - mirror://xorg/individual/app/xev-1.2.6.tar.xz 23 21 mirror://xorg/individual/app/xeyes-1.3.0.tar.xz 24 22 mirror://xorg/individual/app/xfd-1.1.4.tar.xz 25 23 mirror://xorg/individual/app/xfontsel-1.1.1.tar.xz 26 24 mirror://xorg/individual/app/xfs-1.2.2.tar.xz 27 - mirror://xorg/individual/app/xfsinfo-1.0.7.tar.xz 28 25 mirror://xorg/individual/app/xgamma-1.0.7.tar.xz 29 26 mirror://xorg/individual/app/xgc-1.0.6.tar.xz 30 27 mirror://xorg/individual/app/xhost-1.0.10.tar.xz ··· 40 37 mirror://xorg/individual/app/xmessage-1.0.7.tar.xz 41 38 mirror://xorg/individual/app/xmore-1.0.4.tar.xz 42 39 mirror://xorg/individual/app/xpr-1.2.0.tar.xz 43 - mirror://xorg/individual/app/xrandr-1.5.3.tar.xz 44 40 mirror://xorg/individual/app/xrdb-1.2.2.tar.xz 45 41 mirror://xorg/individual/app/xset-1.2.5.tar.xz 46 42 mirror://xorg/individual/app/xsetroot-1.1.3.tar.xz 47 43 mirror://xorg/individual/app/xsm-1.0.6.tar.xz 48 44 mirror://xorg/individual/app/xstdcmap-1.0.5.tar.xz 49 45 mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2 50 - mirror://xorg/individual/app/xvinfo-1.1.5.tar.xz 51 46 mirror://xorg/individual/app/xwd-1.0.9.tar.xz 52 - mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz 53 47 mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz 54 48 mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz 55 49 mirror://xorg/individual/driver/xf86-input-keyboard-2.1.0.tar.xz