libxcb-render-util: refactor, move to pkgs/by-name and rename from xorg.xcbutilrenderutil

relevant changes:
- remove m4 from nativeBuildInputs and gperf from buildInputs, as they
both don't seem to be required

+64 -50
+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 + })
+2 -42
pkgs/servers/x11/xorg/default.nix
··· 19 19 libxcb-errors, 20 20 libxcb-image, 21 21 libxcb-keysyms, 22 + libxcb-render-util, 22 23 libxcb-util, 23 24 libxcvt, 24 25 libxcursor, ··· 109 110 xcbutilimage = libxcb-image; 110 111 xcbutilkeysyms = libxcb-keysyms; 111 112 xcbutil = libxcb-util; 113 + xcbutilrenderutil = libxcb-render-util; 112 114 xkeyboardconfig = xkeyboard-config; 113 115 xorgcffiles = xorg-cf-files; 114 116 xorgdocs = xorg-docs; ··· 3241 3243 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3242 3244 meta = { 3243 3245 pkgConfigModules = [ "xcb-cursor" ]; 3244 - platforms = lib.platforms.unix; 3245 - }; 3246 - }) 3247 - ) { }; 3248 - 3249 - # THIS IS A GENERATED FILE. DO NOT EDIT! 3250 - xcbutilrenderutil = callPackage ( 3251 - { 3252 - stdenv, 3253 - pkg-config, 3254 - fetchurl, 3255 - gperf, 3256 - libxcb, 3257 - xorgproto, 3258 - m4, 3259 - testers, 3260 - }: 3261 - stdenv.mkDerivation (finalAttrs: { 3262 - pname = "xcb-util-renderutil"; 3263 - version = "0.3.10"; 3264 - builder = ./builder.sh; 3265 - src = fetchurl { 3266 - url = "mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz"; 3267 - sha256 = "1fh4dnlwlqyccrhmmwlv082a7mxc7ss7vmzmp7xxp39dwbqd859y"; 3268 - }; 3269 - hardeningDisable = [ 3270 - "bindnow" 3271 - "relro" 3272 - ]; 3273 - strictDeps = true; 3274 - nativeBuildInputs = [ 3275 - pkg-config 3276 - m4 3277 - ]; 3278 - buildInputs = [ 3279 - gperf 3280 - libxcb 3281 - xorgproto 3282 - ]; 3283 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 3284 - meta = { 3285 - pkgConfigModules = [ "xcb-renderutil" ]; 3286 3246 platforms = lib.platforms.unix; 3287 3247 }; 3288 3248 })
+3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 53 53 $pcMap{"xcb-image"} = "xcbutilimage"; 54 54 $pcMap{"xcb-keysyms"} = "xcbutilkeysyms"; 55 55 $pcMap{"xcb-proto"} = "xcbproto"; 56 + $pcMap{"xcb-renderutil"} = "xcbutilrenderutil"; 56 57 $pcMap{"xcb-util"} = "xcbutil"; 57 58 $pcMap{"xcursor"} = "libXcursor"; 58 59 $pcMap{"xdmcp"} = "libXdmcp"; ··· 319 320 libxcb-errors, 320 321 libxcb-image, 321 322 libxcb-keysyms, 323 + libxcb-render-util, 322 324 libxcb-util, 323 325 libxcvt, 324 326 libxcursor, ··· 409 411 xcbutilimage = libxcb-image; 410 412 xcbutilkeysyms = libxcb-keysyms; 411 413 xcbutil = libxcb-util; 414 + xcbutilrenderutil = libxcb-render-util; 412 415 xkeyboardconfig = xkeyboard-config; 413 416 xorgcffiles = xorg-cf-files; 414 417 xorgdocs = xorg-docs;
-7
pkgs/servers/x11/xorg/overrides.nix
··· 447 447 }; 448 448 }); 449 449 450 - xcbutilrenderutil = super.xcbutilrenderutil.overrideAttrs (attrs: { 451 - outputs = [ 452 - "out" 453 - "dev" 454 - ]; # mainly to get rid of propagating others 455 - }); 456 - 457 450 xcbutilwm = super.xcbutilwm.overrideAttrs (attrs: { 458 451 outputs = [ 459 452 "out"
-1
pkgs/servers/x11/xorg/tarballs.list
··· 1 - mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz 2 1 mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz 3 2 mirror://xorg/individual/app/appres-1.0.7.tar.xz 4 3 mirror://xorg/individual/app/bitmap-1.1.1.tar.xz