libxcb-{util,errors,image,keysyms,render-util,wm}: refactor, move to pkgs/by-name and rename from xorg.xcbutil* (#434876)

authored by jopejoe1 and committed by GitHub 3455c303 2ba62389

+398 -314
+62
pkgs/by-name/li/libxcb-errors/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + m4, 7 + python3, 8 + xcbproto, 9 + libxcb, 10 + writeScript, 11 + testers, 12 + }: 13 + stdenv.mkDerivation (finalAttrs: { 14 + pname = "libxcb-errors"; 15 + version = "1.0.1"; 16 + 17 + outputs = [ 18 + "out" 19 + "dev" 20 + ]; 21 + 22 + src = fetchurl { 23 + url = "mirror://xorg/individual/xcb/xcb-util-errors-${finalAttrs.version}.tar.xz"; 24 + hash = "sha256-VijIe5hCWa2Se6zYpClYMZw2vfSwZYh4A8nYIPuA81c="; 25 + }; 26 + 27 + strictDeps = true; 28 + 29 + nativeBuildInputs = [ 30 + pkg-config 31 + m4 32 + python3 33 + ]; 34 + 35 + buildInputs = [ 36 + xcbproto 37 + libxcb 38 + ]; 39 + 40 + propagatedBuildInputs = [ libxcb ]; 41 + 42 + passthru = { 43 + updateScript = writeScript "update-${finalAttrs.pname}" '' 44 + #!/usr/bin/env nix-shell 45 + #!nix-shell -i bash -p common-updater-scripts 46 + version="$(list-directory-versions --pname xcb-util-errors \ 47 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 48 + | sort -V | tail -n1)" 49 + update-source-version ${finalAttrs.pname} "$version" 50 + ''; 51 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 52 + }; 53 + 54 + meta = { 55 + description = "XCB utility library that gives human readable names to error, event & request codes"; 56 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-errors"; 57 + license = lib.licenses.x11; 58 + maintainers = [ ]; 59 + pkgConfigModules = [ "xcb-errors" ]; 60 + platforms = lib.platforms.unix; 61 + }; 62 + })
+62
pkgs/by-name/li/libxcb-image/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + m4, 7 + xorgproto, 8 + libxcb, 9 + libxcb-util, 10 + writeScript, 11 + testers, 12 + }: 13 + stdenv.mkDerivation (finalAttrs: { 14 + pname = "libxcb-image"; 15 + version = "0.4.1"; 16 + 17 + outputs = [ 18 + "out" 19 + "dev" 20 + ]; 21 + 22 + src = fetchurl { 23 + url = "mirror://xorg/individual/xcb/xcb-util-image-${finalAttrs.version}.tar.xz"; 24 + hash = "sha256-zK2O5drbEnH9RyetFNm9d6ZOUFYIdmxOmCZ9mu3kDT0="; 25 + }; 26 + 27 + strictDeps = true; 28 + 29 + nativeBuildInputs = [ 30 + pkg-config 31 + m4 32 + ]; 33 + 34 + buildInputs = [ 35 + xorgproto 36 + libxcb 37 + libxcb-util 38 + ]; 39 + 40 + propagatedBuildInputs = [ libxcb ]; 41 + 42 + passthru = { 43 + updateScript = writeScript "update-${finalAttrs.pname}" '' 44 + #!/usr/bin/env nix-shell 45 + #!nix-shell -i bash -p common-updater-scripts 46 + version="$(list-directory-versions --pname xcb-util-image \ 47 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 48 + | sort -V | tail -n1)" 49 + update-source-version ${finalAttrs.pname} "$version" 50 + ''; 51 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 52 + }; 53 + 54 + meta = { 55 + description = "XCB port of Xlib's XImage and XShmImage functions."; 56 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-image"; 57 + license = lib.licenses.x11; 58 + maintainers = [ ]; 59 + pkgConfigModules = [ "xcb-image" ]; 60 + platforms = lib.platforms.unix; 61 + }; 62 + })
+56
pkgs/by-name/li/libxcb-keysyms/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + libxcb, 7 + xorgproto, 8 + writeScript, 9 + testers, 10 + }: 11 + stdenv.mkDerivation (finalAttrs: { 12 + pname = "libxcb-keysyms"; 13 + version = "0.4.1"; 14 + 15 + outputs = [ 16 + "out" 17 + "dev" 18 + ]; 19 + 20 + src = fetchurl { 21 + url = "mirror://xorg/individual/xcb/xcb-util-keysyms-${finalAttrs.version}.tar.xz"; 22 + hash = "sha256-fCYKUpRBKu1CnfHaL4r9O9B7fLo/7HcvuhWmE6bVxjg="; 23 + }; 24 + 25 + strictDeps = true; 26 + 27 + nativeBuildInputs = [ pkg-config ]; 28 + 29 + buildInputs = [ 30 + libxcb 31 + xorgproto 32 + ]; 33 + 34 + propagatedBuildInputs = [ libxcb ]; 35 + 36 + passthru = { 37 + updateScript = writeScript "update-${finalAttrs.pname}" '' 38 + #!/usr/bin/env nix-shell 39 + #!nix-shell -i bash -p common-updater-scripts 40 + version="$(list-directory-versions --pname xcb-util-keysyms \ 41 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 42 + | sort -V | tail -n1)" 43 + update-source-version ${finalAttrs.pname} "$version" 44 + ''; 45 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 46 + }; 47 + 48 + meta = { 49 + description = "Standard X key constants and conversion to/from keycodes"; 50 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms"; 51 + license = lib.licenses.x11; 52 + maintainers = [ ]; 53 + pkgConfigModules = [ "xcb-keysyms" ]; 54 + platforms = lib.platforms.unix; 55 + }; 56 + })
+59
pkgs/by-name/li/libxcb-render-util/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + libxcb, 7 + xorgproto, 8 + writeScript, 9 + testers, 10 + }: 11 + stdenv.mkDerivation (finalAttrs: { 12 + pname = "libxcb-render-util"; 13 + version = "0.3.10"; 14 + 15 + outputs = [ 16 + "out" 17 + "dev" 18 + ]; 19 + 20 + src = fetchurl { 21 + url = "mirror://xorg/individual/xcb/xcb-util-renderutil-${finalAttrs.version}.tar.xz"; 22 + hash = "sha256-PhXU8OItjdv7ufXXfbQ+rNejBAKb8lphZsxjyqltBLo="; 23 + }; 24 + 25 + strictDeps = true; 26 + 27 + nativeBuildInputs = [ pkg-config ]; 28 + 29 + buildInputs = [ 30 + libxcb 31 + xorgproto 32 + ]; 33 + 34 + propagatedBuildInputs = [ libxcb ]; 35 + 36 + passthru = { 37 + updateScript = writeScript "update-${finalAttrs.pname}" '' 38 + #!/usr/bin/env nix-shell 39 + #!nix-shell -i bash -p common-updater-scripts 40 + version="$(list-directory-versions --pname xcb-util-renderutil \ 41 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 42 + | sort -V | tail -n1)" 43 + update-source-version ${finalAttrs.pname} "$version" 44 + ''; 45 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 46 + }; 47 + 48 + meta = { 49 + description = "XCB convenience functions for the Render extension"; 50 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util"; 51 + license = with lib.licenses; [ 52 + hpndSellVariant 53 + x11 54 + ]; 55 + maintainers = [ ]; 56 + pkgConfigModules = [ "xcb-renderutil" ]; 57 + platforms = lib.platforms.unix; 58 + }; 59 + })
+62
pkgs/by-name/li/libxcb-util/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + libxcb, 7 + writeScript, 8 + testers, 9 + }: 10 + stdenv.mkDerivation (finalAttrs: { 11 + pname = "libxcb-util"; 12 + version = "0.4.1"; 13 + 14 + outputs = [ 15 + "out" 16 + "dev" 17 + ]; 18 + 19 + src = fetchurl { 20 + url = "mirror://xorg/individual/xcb/xcb-util-${finalAttrs.version}.tar.xz"; 21 + hash = "sha256-Wr47u9jlTw+j7JRSkbfo+oz9PMzENxj4dYQw+UEm5RI="; 22 + }; 23 + 24 + strictDeps = true; 25 + 26 + nativeBuildInputs = [ pkg-config ]; 27 + buildInputs = [ libxcb ]; 28 + propagatedBuildInputs = [ libxcb ]; 29 + 30 + passthru = { 31 + updateScript = writeScript "update-${finalAttrs.pname}" '' 32 + #!/usr/bin/env nix-shell 33 + #!nix-shell -i bash -p common-updater-scripts 34 + version="$(list-directory-versions --pname xcb-util \ 35 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 36 + | sort -V | tail -n1)" 37 + update-source-version ${finalAttrs.pname} "$version" 38 + ''; 39 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 40 + }; 41 + 42 + meta = { 43 + description = "XCB utility libraries"; 44 + longDescription = '' 45 + The XCB util modules provides a number of libraries which sit on top of libxcb, the core 46 + X protocol library, and some of the extension libraries. These experimental libraries provid 47 + convenience functions and interfaces which make the raw X protocol more usable. Some of the 48 + libraries also provide client-side code which is not strictly part of the X protocol but which 49 + have traditionally been provided by Xlib. 50 + ''; 51 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-util"; 52 + license = lib.licenses.x11; 53 + maintainers = [ ]; 54 + pkgConfigModules = [ 55 + "xcb-atom" 56 + "xcb-aux" 57 + "xcb-event" 58 + "xcb-util" 59 + ]; 60 + platforms = lib.platforms.unix; 61 + }; 62 + })
+63
pkgs/by-name/li/libxcb-wm/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + libxcb, 7 + xorgproto, 8 + m4, 9 + writeScript, 10 + testers, 11 + }: 12 + stdenv.mkDerivation (finalAttrs: { 13 + pname = "libxcb-wm"; 14 + version = "0.4.2"; 15 + 16 + outputs = [ 17 + "out" 18 + "dev" 19 + ]; 20 + 21 + src = fetchurl { 22 + url = "mirror://xorg/individual/xcb/xcb-util-wm-${finalAttrs.version}.tar.xz"; 23 + hash = "sha256-YsNOIdBiZGh/rqftv2NjLJ8E1V5yEUqkpXu5Xk+Iigs="; 24 + }; 25 + 26 + strictDeps = true; 27 + 28 + nativeBuildInputs = [ 29 + pkg-config 30 + m4 31 + ]; 32 + 33 + buildInputs = [ 34 + libxcb 35 + xorgproto 36 + ]; 37 + 38 + propagatedBuildInputs = [ libxcb ]; 39 + 40 + passthru = { 41 + updateScript = writeScript "update-${finalAttrs.pname}" '' 42 + #!/usr/bin/env nix-shell 43 + #!nix-shell -i bash -p common-updater-scripts 44 + version="$(list-directory-versions --pname xcb-util-wm \ 45 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 46 + | sort -V | tail -n1)" 47 + update-source-version ${finalAttrs.pname} "$version" 48 + ''; 49 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 50 + }; 51 + 52 + meta = { 53 + description = "XCB client and window-manager helpers for ICCCM & EWMH."; 54 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb-wm"; 55 + license = lib.licenses.x11; 56 + maintainers = [ ]; 57 + pkgConfigModules = [ 58 + "xcb-ewmh" 59 + "xcb-icccm" 60 + ]; 61 + platforms = lib.platforms.unix; 62 + }; 63 + })
+12 -266
pkgs/servers/x11/xorg/default.nix
··· 19 19 libxau, 20 20 libxaw, 21 21 libxcb, 22 + libxcb-errors, 23 + libxcb-image, 24 + libxcb-keysyms, 25 + libxcb-render-util, 26 + libxcb-util, 27 + libxcb-wm, 22 28 libxcvt, 23 29 libxcursor, 24 30 libxdmcp, ··· 121 127 libXxf86vm = libxxf86vm; 122 128 utilmacros = util-macros; 123 129 xcbproto = xcb-proto; 130 + xcbutilerrors = libxcb-errors; 131 + xcbutilimage = libxcb-image; 132 + xcbutilkeysyms = libxcb-keysyms; 133 + xcbutil = libxcb-util; 134 + xcbutilrenderutil = libxcb-render-util; 135 + xcbutilwm = libxcb-wm; 124 136 xkeyboardconfig = xkeyboard-config; 125 137 xorgcffiles = xorg-cf-files; 126 138 xorgdocs = xorg-docs; ··· 2808 2820 ) { }; 2809 2821 2810 2822 # THIS IS A GENERATED FILE. DO NOT EDIT! 2811 - xcbutil = callPackage ( 2812 - { 2813 - stdenv, 2814 - pkg-config, 2815 - fetchurl, 2816 - gperf, 2817 - libxcb, 2818 - xorgproto, 2819 - m4, 2820 - testers, 2821 - }: 2822 - stdenv.mkDerivation (finalAttrs: { 2823 - pname = "xcb-util"; 2824 - version = "0.4.1"; 2825 - builder = ./builder.sh; 2826 - src = fetchurl { 2827 - url = "mirror://xorg/individual/xcb/xcb-util-0.4.1.tar.xz"; 2828 - sha256 = "04p54r0zjc44fpw1hdy4rhygv37sx2vr2lllxjihykz5v2xkpgjs"; 2829 - }; 2830 - hardeningDisable = [ 2831 - "bindnow" 2832 - "relro" 2833 - ]; 2834 - strictDeps = true; 2835 - nativeBuildInputs = [ 2836 - pkg-config 2837 - m4 2838 - ]; 2839 - buildInputs = [ 2840 - gperf 2841 - libxcb 2842 - xorgproto 2843 - ]; 2844 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2845 - meta = { 2846 - pkgConfigModules = [ 2847 - "xcb-atom" 2848 - "xcb-aux" 2849 - "xcb-event" 2850 - "xcb-util" 2851 - ]; 2852 - platforms = lib.platforms.unix; 2853 - }; 2854 - }) 2855 - ) { }; 2856 - 2857 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2858 2823 xcbutilcursor = callPackage ( 2859 2824 { 2860 2825 stdenv, ··· 2895 2860 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2896 2861 meta = { 2897 2862 pkgConfigModules = [ "xcb-cursor" ]; 2898 - platforms = lib.platforms.unix; 2899 - }; 2900 - }) 2901 - ) { }; 2902 - 2903 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2904 - xcbutilerrors = callPackage ( 2905 - { 2906 - stdenv, 2907 - pkg-config, 2908 - fetchurl, 2909 - gperf, 2910 - libxcb, 2911 - xcbproto, 2912 - xorgproto, 2913 - m4, 2914 - python3, 2915 - testers, 2916 - }: 2917 - stdenv.mkDerivation (finalAttrs: { 2918 - pname = "xcb-util-errors"; 2919 - version = "1.0.1"; 2920 - builder = ./builder.sh; 2921 - src = fetchurl { 2922 - url = "mirror://xorg/individual/xcb/xcb-util-errors-1.0.1.tar.xz"; 2923 - sha256 = "0mzkh3xj1n690dw8hrdhyjykd71ib0ls9n5cgf9asna2k1xwha2n"; 2924 - }; 2925 - hardeningDisable = [ 2926 - "bindnow" 2927 - "relro" 2928 - ]; 2929 - strictDeps = true; 2930 - nativeBuildInputs = [ 2931 - pkg-config 2932 - m4 2933 - python3 2934 - ]; 2935 - buildInputs = [ 2936 - gperf 2937 - libxcb 2938 - xcbproto 2939 - xorgproto 2940 - ]; 2941 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2942 - meta = { 2943 - pkgConfigModules = [ "xcb-errors" ]; 2944 - platforms = lib.platforms.unix; 2945 - }; 2946 - }) 2947 - ) { }; 2948 - 2949 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2950 - xcbutilimage = callPackage ( 2951 - { 2952 - stdenv, 2953 - pkg-config, 2954 - fetchurl, 2955 - gperf, 2956 - libxcb, 2957 - xcbutil, 2958 - xorgproto, 2959 - m4, 2960 - testers, 2961 - }: 2962 - stdenv.mkDerivation (finalAttrs: { 2963 - pname = "xcb-util-image"; 2964 - version = "0.4.1"; 2965 - builder = ./builder.sh; 2966 - src = fetchurl { 2967 - url = "mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz"; 2968 - sha256 = "0g8dwknrlz96k176qxh8ar84x9kpppci9b978zyp24nvvbjqxbfc"; 2969 - }; 2970 - hardeningDisable = [ 2971 - "bindnow" 2972 - "relro" 2973 - ]; 2974 - strictDeps = true; 2975 - nativeBuildInputs = [ 2976 - pkg-config 2977 - m4 2978 - ]; 2979 - buildInputs = [ 2980 - gperf 2981 - libxcb 2982 - xcbutil 2983 - xorgproto 2984 - ]; 2985 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2986 - meta = { 2987 - pkgConfigModules = [ "xcb-image" ]; 2988 - platforms = lib.platforms.unix; 2989 - }; 2990 - }) 2991 - ) { }; 2992 - 2993 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2994 - xcbutilkeysyms = callPackage ( 2995 - { 2996 - stdenv, 2997 - pkg-config, 2998 - fetchurl, 2999 - gperf, 3000 - libxcb, 3001 - xorgproto, 3002 - m4, 3003 - testers, 3004 - }: 3005 - stdenv.mkDerivation (finalAttrs: { 3006 - pname = "xcb-util-keysyms"; 3007 - version = "0.4.1"; 3008 - builder = ./builder.sh; 3009 - src = fetchurl { 3010 - url = "mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz"; 3011 - sha256 = "0f66snk179hmp8ppgv1zp9y7pl1vzn52znpikm1fsaj1ji90l9kw"; 3012 - }; 3013 - hardeningDisable = [ 3014 - "bindnow" 3015 - "relro" 3016 - ]; 3017 - strictDeps = true; 3018 - nativeBuildInputs = [ 3019 - pkg-config 3020 - m4 3021 - ]; 3022 - buildInputs = [ 3023 - gperf 3024 - libxcb 3025 - xorgproto 3026 - ]; 3027 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3028 - meta = { 3029 - pkgConfigModules = [ "xcb-keysyms" ]; 3030 - platforms = lib.platforms.unix; 3031 - }; 3032 - }) 3033 - ) { }; 3034 - 3035 - # THIS IS A GENERATED FILE. DO NOT EDIT! 3036 - xcbutilrenderutil = callPackage ( 3037 - { 3038 - stdenv, 3039 - pkg-config, 3040 - fetchurl, 3041 - gperf, 3042 - libxcb, 3043 - xorgproto, 3044 - m4, 3045 - testers, 3046 - }: 3047 - stdenv.mkDerivation (finalAttrs: { 3048 - pname = "xcb-util-renderutil"; 3049 - version = "0.3.10"; 3050 - builder = ./builder.sh; 3051 - src = fetchurl { 3052 - url = "mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz"; 3053 - sha256 = "1fh4dnlwlqyccrhmmwlv082a7mxc7ss7vmzmp7xxp39dwbqd859y"; 3054 - }; 3055 - hardeningDisable = [ 3056 - "bindnow" 3057 - "relro" 3058 - ]; 3059 - strictDeps = true; 3060 - nativeBuildInputs = [ 3061 - pkg-config 3062 - m4 3063 - ]; 3064 - buildInputs = [ 3065 - gperf 3066 - libxcb 3067 - xorgproto 3068 - ]; 3069 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3070 - meta = { 3071 - pkgConfigModules = [ "xcb-renderutil" ]; 3072 - platforms = lib.platforms.unix; 3073 - }; 3074 - }) 3075 - ) { }; 3076 - 3077 - # THIS IS A GENERATED FILE. DO NOT EDIT! 3078 - xcbutilwm = callPackage ( 3079 - { 3080 - stdenv, 3081 - pkg-config, 3082 - fetchurl, 3083 - gperf, 3084 - libxcb, 3085 - xorgproto, 3086 - m4, 3087 - testers, 3088 - }: 3089 - stdenv.mkDerivation (finalAttrs: { 3090 - pname = "xcb-util-wm"; 3091 - version = "0.4.2"; 3092 - builder = ./builder.sh; 3093 - src = fetchurl { 3094 - url = "mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz"; 3095 - sha256 = "02wai17mxfbvlnj4l4bjbvah97rccdivzvd7mrznhr32s0hlxhv2"; 3096 - }; 3097 - hardeningDisable = [ 3098 - "bindnow" 3099 - "relro" 3100 - ]; 3101 - strictDeps = true; 3102 - nativeBuildInputs = [ 3103 - pkg-config 3104 - m4 3105 - ]; 3106 - buildInputs = [ 3107 - gperf 3108 - libxcb 3109 - xorgproto 3110 - ]; 3111 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3112 - meta = { 3113 - pkgConfigModules = [ 3114 - "xcb-ewmh" 3115 - "xcb-icccm" 3116 - ]; 3117 2863 platforms = lib.platforms.unix; 3118 2864 }; 3119 2865 })
+22
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 50 50 $pcMap{"xaw6"} = "libXaw"; 51 51 $pcMap{"xaw7"} = "libXaw"; 52 52 $pcMap{"xbitmaps"} = "xbitmaps"; 53 + $pcMap{"xcb-atom"} = "xcbutil"; 54 + $pcMap{"xcb-aux"} = "xcbutil"; 55 + $pcMap{"xcb-errors"} = "xcbutilerrors"; 56 + $pcMap{"xcb-event"} = "xcbutil"; 57 + $pcMap{"xcb-ewmh"} = "xcbutilwm"; 58 + $pcMap{"xcb-icccm"} = "xcbutilwm"; 59 + $pcMap{"xcb-image"} = "xcbutilimage"; 60 + $pcMap{"xcb-keysyms"} = "xcbutilkeysyms"; 53 61 $pcMap{"xcb-proto"} = "xcbproto"; 62 + $pcMap{"xcb-renderutil"} = "xcbutilrenderutil"; 63 + $pcMap{"xcb-util"} = "xcbutil"; 54 64 $pcMap{"xcursor"} = "libXcursor"; 55 65 $pcMap{"xdmcp"} = "libXdmcp"; 56 66 $pcMap{"xext"} = "libXext"; ··· 325 335 libxau, 326 336 libxaw, 327 337 libxcb, 338 + libxcb-errors, 339 + libxcb-image, 340 + libxcb-keysyms, 341 + libxcb-render-util, 342 + libxcb-util, 343 + libxcb-wm, 328 344 libxcvt, 329 345 libxcursor, 330 346 libxdmcp, ··· 427 443 libXxf86vm = libxxf86vm; 428 444 utilmacros = util-macros; 429 445 xcbproto = xcb-proto; 446 + xcbutilerrors = libxcb-errors; 447 + xcbutilimage = libxcb-image; 448 + xcbutilkeysyms = libxcb-keysyms; 449 + xcbutil = libxcb-util; 450 + xcbutilrenderutil = libxcb-render-util; 451 + xcbutilwm = libxcb-wm; 430 452 xkeyboardconfig = xkeyboard-config; 431 453 xorgcffiles = xorg-cf-files; 432 454 xorgdocs = xorg-docs;
-42
pkgs/servers/x11/xorg/overrides.nix
··· 339 339 340 340 xcalc = addMainProgram super.xcalc { }; 341 341 342 - xcbutil = super.xcbutil.overrideAttrs (attrs: { 343 - outputs = [ 344 - "out" 345 - "dev" 346 - ]; 347 - }); 348 - 349 - xcbutilerrors = super.xcbutilerrors.overrideAttrs (attrs: { 350 - outputs = [ 351 - "out" 352 - "dev" 353 - ]; # mainly to get rid of propagating others 354 - }); 355 - 356 342 xcbutilcursor = super.xcbutilcursor.overrideAttrs (attrs: { 357 343 outputs = [ 358 344 "out" ··· 361 347 meta = attrs.meta // { 362 348 maintainers = [ lib.maintainers.lovek323 ]; 363 349 }; 364 - }); 365 - 366 - xcbutilimage = super.xcbutilimage.overrideAttrs (attrs: { 367 - outputs = [ 368 - "out" 369 - "dev" 370 - ]; # mainly to get rid of propagating others 371 - }); 372 - 373 - xcbutilkeysyms = super.xcbutilkeysyms.overrideAttrs (attrs: { 374 - outputs = [ 375 - "out" 376 - "dev" 377 - ]; # mainly to get rid of propagating others 378 - }); 379 - 380 - xcbutilrenderutil = super.xcbutilrenderutil.overrideAttrs (attrs: { 381 - outputs = [ 382 - "out" 383 - "dev" 384 - ]; # mainly to get rid of propagating others 385 - }); 386 - 387 - xcbutilwm = super.xcbutilwm.overrideAttrs (attrs: { 388 - outputs = [ 389 - "out" 390 - "dev" 391 - ]; # mainly to get rid of propagating others 392 350 }); 393 351 394 352 xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: {
-6
pkgs/servers/x11/xorg/tarballs.list
··· 1 - mirror://xorg/individual/xcb/xcb-util-0.4.1.tar.xz 2 - mirror://xorg/individual/xcb/xcb-util-errors-1.0.1.tar.xz 3 - mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz 4 - mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz 5 - mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz 6 - mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz 7 1 mirror://xorg/individual/app/appres-1.0.7.tar.xz 8 2 mirror://xorg/individual/app/bitmap-1.1.1.tar.xz 9 3 mirror://xorg/individual/app/editres-1.0.9.tar.xz