libxau: refactor, move to pkgs/by-name and rename from xorg.libXau

authored by Zitrone and committed by Alyssa Ross 6ef27624 50b5017b

+53 -41
+48
pkgs/by-name/li/libxau/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + writeScript, 8 + testers, 9 + }: 10 + stdenv.mkDerivation (finalAttrs: { 11 + pname = "libxau"; 12 + version = "1.0.12"; 13 + 14 + outputs = [ 15 + "out" 16 + "dev" 17 + ]; 18 + 19 + src = fetchurl { 20 + url = "mirror://xorg/individual/lib/libXau-${finalAttrs.version}.tar.xz"; 21 + hash = "sha256-dNDk36PTmtiTnpm9o39ZZ6ulKCEQdoKEZNJ3fUd/wPs="; 22 + }; 23 + 24 + strictDeps = true; 25 + nativeBuildInputs = [ pkg-config ]; 26 + propagatedBuildInputs = [ xorgproto ]; 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 libXau \ 33 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 34 + | sort -V | tail -n1)" 35 + update-source-version ${finalAttrs.pname} "$version" 36 + ''; 37 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 38 + }; 39 + 40 + meta = { 41 + description = "Functions for handling Xauthority files and entries."; 42 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxau"; 43 + license = lib.licenses.mitOpenGroup; 44 + maintainers = [ ]; 45 + pkgConfigModules = [ "xau" ]; 46 + platforms = lib.platforms.unix; 47 + }; 48 + })
+2 -32
pkgs/servers/x11/xorg/default.nix
··· 8 8 imake, 9 9 libpciaccess, 10 10 libpthread-stubs, 11 + libxau, 11 12 libxcvt, 12 13 libxdmcp, 13 14 lndir, ··· 46 47 fontalias = font-alias; 47 48 fontutil = font-util; 48 49 libpthreadstubs = libpthread-stubs; 50 + libXau = libxau; 49 51 libXdmcp = libxdmcp; 50 52 utilmacros = util-macros; 51 53 xcbproto = xcb-proto; ··· 2027 2029 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2028 2030 meta = { 2029 2031 pkgConfigModules = [ "xtrap" ]; 2030 - platforms = lib.platforms.unix; 2031 - }; 2032 - }) 2033 - ) { }; 2034 - 2035 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2036 - libXau = callPackage ( 2037 - { 2038 - stdenv, 2039 - pkg-config, 2040 - fetchurl, 2041 - xorgproto, 2042 - testers, 2043 - }: 2044 - stdenv.mkDerivation (finalAttrs: { 2045 - pname = "libXau"; 2046 - version = "1.0.12"; 2047 - builder = ./builder.sh; 2048 - src = fetchurl { 2049 - url = "mirror://xorg/individual/lib/libXau-1.0.12.tar.xz"; 2050 - sha256 = "1yy0gx3psxyjcj284xhh44labav7b5zs7gcrks9xi6nklggy9l3l"; 2051 - }; 2052 - hardeningDisable = [ 2053 - "bindnow" 2054 - "relro" 2055 - ]; 2056 - strictDeps = true; 2057 - nativeBuildInputs = [ pkg-config ]; 2058 - buildInputs = [ xorgproto ]; 2059 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2060 - meta = { 2061 - pkgConfigModules = [ "xau" ]; 2062 2032 platforms = lib.platforms.unix; 2063 2033 }; 2064 2034 })
+3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 39 39 $pcMap{"fontutil"} = "fontutil"; 40 40 $pcMap{"pciaccess"} = "libpciaccess"; 41 41 $pcMap{"pthread-stubs"} = "libpthreadstubs"; 42 + $pcMap{"xau"} = "libXau"; 42 43 $pcMap{"xbitmaps"} = "xbitmaps"; 43 44 $pcMap{"xcb-proto"} = "xcbproto"; 44 45 $pcMap{"xdmcp"} = "libXdmcp"; ··· 283 284 imake, 284 285 libpciaccess, 285 286 libpthread-stubs, 287 + libxau, 286 288 libxcvt, 287 289 libxdmcp, 288 290 lndir, ··· 321 323 fontalias = font-alias; 322 324 fontutil = font-util; 323 325 libpthreadstubs = libpthread-stubs; 326 + libXau = libxau; 324 327 libXdmcp = libxdmcp; 325 328 utilmacros = util-macros; 326 329 xcbproto = xcb-proto;
-8
pkgs/servers/x11/xorg/overrides.nix
··· 235 235 }; 236 236 }); 237 237 238 - libXau = super.libXau.overrideAttrs (attrs: { 239 - outputs = [ 240 - "out" 241 - "dev" 242 - ]; 243 - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.xorgproto ]; 244 - }); 245 - 246 238 libXtst = super.libXtst.overrideAttrs (attrs: { 247 239 meta = attrs.meta // { 248 240 pkgConfigModules = [ "xtst" ];
-1
pkgs/servers/x11/xorg/tarballs.list
··· 162 162 mirror://xorg/individual/lib/libSM-1.2.6.tar.xz 163 163 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 164 164 mirror://xorg/individual/lib/libX11-1.8.12.tar.xz 165 - mirror://xorg/individual/lib/libXau-1.0.12.tar.xz 166 165 mirror://xorg/individual/lib/libXaw-1.0.16.tar.xz 167 166 mirror://xorg/individual/lib/libxcb-1.17.0.tar.xz 168 167 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz