libxext: refactor, move to pkgs/by-name and rename from xorg.libXext

authored by Zitrone and committed by Alyssa Ross 8ce173be 3c1d6186

+79 -51
+74
pkgs/by-name/li/libxext/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + libX11, 7 + xorgproto, 8 + libxau, 9 + writeScript, 10 + testers, 11 + }: 12 + stdenv.mkDerivation (finalAttrs: { 13 + pname = "libxext"; 14 + version = "1.3.6"; 15 + 16 + outputs = [ 17 + "out" 18 + "dev" 19 + "man" 20 + "doc" 21 + ]; 22 + 23 + src = fetchurl { 24 + url = "mirror://xorg/individual/lib/libXext-${finalAttrs.version}.tar.xz"; 25 + hash = "sha256-7bWfojmU5AX9xbQAr99YIK5hYLlPNePcPaRFehbol1M="; 26 + }; 27 + 28 + strictDeps = true; 29 + 30 + nativeBuildInputs = [ pkg-config ]; 31 + 32 + buildInputs = [ 33 + libX11 34 + xorgproto 35 + ]; 36 + propagatedBuildInputs = [ 37 + xorgproto 38 + libxau 39 + ]; 40 + 41 + configureFlags = lib.optional ( 42 + stdenv.hostPlatform != stdenv.buildPlatform 43 + ) "--enable-malloc0returnsnull"; 44 + 45 + passthru = { 46 + updateScript = writeScript "update-${finalAttrs.pname}" '' 47 + #!/usr/bin/env nix-shell 48 + #!nix-shell -i bash -p common-updater-scripts 49 + version="$(list-directory-versions --pname libXext \ 50 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 51 + | sort -V | tail -n1)" 52 + update-source-version ${finalAttrs.pname} "$version" 53 + ''; 54 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 55 + }; 56 + 57 + meta = { 58 + description = "Xlib-based library for common extensions to the X11 protocol"; 59 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxext"; 60 + license = with lib.licenses; [ 61 + mitOpenGroup 62 + x11 63 + hpnd 64 + hpndSellVariant 65 + hpndDocSell 66 + hpndDoc 67 + mit 68 + isc 69 + ]; 70 + maintainers = [ ]; 71 + pkgConfigModules = [ "xext" ]; 72 + platforms = lib.platforms.unix; 73 + }; 74 + })
+2 -36
pkgs/servers/x11/xorg/default.nix
··· 13 13 libxcb, 14 14 libxcvt, 15 15 libxdmcp, 16 + libxext, 16 17 lndir, 17 18 luit, 18 19 makedepend, ··· 53 54 libX11 = libx11; 54 55 libXau = libxau; 55 56 libXdmcp = libxdmcp; 57 + libXext = libxext; 56 58 utilmacros = util-macros; 57 59 xcbproto = xcb-proto; 58 60 xkeyboardconfig = xkeyboard-config; ··· 2153 2155 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2154 2156 meta = { 2155 2157 pkgConfigModules = [ "xdamage" ]; 2156 - platforms = lib.platforms.unix; 2157 - }; 2158 - }) 2159 - ) { }; 2160 - 2161 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2162 - libXext = callPackage ( 2163 - { 2164 - stdenv, 2165 - pkg-config, 2166 - fetchurl, 2167 - libX11, 2168 - xorgproto, 2169 - testers, 2170 - }: 2171 - stdenv.mkDerivation (finalAttrs: { 2172 - pname = "libXext"; 2173 - version = "1.3.6"; 2174 - builder = ./builder.sh; 2175 - src = fetchurl { 2176 - url = "mirror://xorg/individual/lib/libXext-1.3.6.tar.xz"; 2177 - sha256 = "0lwpx0b7lid47pff6dagp5h63bi0b3gsy05lqpyhbr4l76i9zdgd"; 2178 - }; 2179 - hardeningDisable = [ 2180 - "bindnow" 2181 - "relro" 2182 - ]; 2183 - strictDeps = true; 2184 - nativeBuildInputs = [ pkg-config ]; 2185 - buildInputs = [ 2186 - libX11 2187 - xorgproto 2188 - ]; 2189 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2190 - meta = { 2191 - pkgConfigModules = [ "xext" ]; 2192 2158 platforms = lib.platforms.unix; 2193 2159 }; 2194 2160 })
+3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 45 45 $pcMap{"xbitmaps"} = "xbitmaps"; 46 46 $pcMap{"xcb-proto"} = "xcbproto"; 47 47 $pcMap{"xdmcp"} = "libXdmcp"; 48 + $pcMap{"xext"} = "libXext"; 48 49 $pcMap{"xtrans"} = "xtrans"; 49 50 $pcMap{"\$PIXMAN"} = "pixman"; 50 51 $pcMap{"\$RENDERPROTO"} = "xorgproto"; ··· 297 298 libxcb, 298 299 libxcvt, 299 300 libxdmcp, 301 + libxext, 300 302 lndir, 301 303 luit, 302 304 makedepend, ··· 337 339 libX11 = libx11; 338 340 libXau = libxau; 339 341 libXdmcp = libxdmcp; 342 + libXext = libxext; 340 343 utilmacros = util-macros; 341 344 xcbproto = xcb-proto; 342 345 xkeyboardconfig = xkeyboard-config;
-14
pkgs/servers/x11/xorg/overrides.nix
··· 316 316 }; 317 317 }); 318 318 319 - libXext = super.libXext.overrideAttrs (attrs: { 320 - outputs = [ 321 - "out" 322 - "dev" 323 - "man" 324 - "doc" 325 - ]; 326 - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ 327 - xorg.xorgproto 328 - xorg.libXau 329 - ]; 330 - configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 331 - }); 332 - 333 319 libXfixes = super.libXfixes.overrideAttrs (attrs: { 334 320 outputs = [ 335 321 "out"
-1
pkgs/servers/x11/xorg/tarballs.list
··· 165 165 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz 166 166 mirror://xorg/individual/lib/libXcursor-1.2.3.tar.xz 167 167 mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz 168 - mirror://xorg/individual/lib/libXext-1.3.6.tar.xz 169 168 mirror://xorg/individual/lib/libXfixes-6.0.1.tar.xz 170 169 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 171 170 mirror://xorg/individual/lib/libXfont2-2.0.7.tar.xz