libxrandr: refactor and migrate to pkgs/by-name from xorg.libXrandr

Zitrone 21144d55 aae6be8d

+69 -50
+64
pkgs/by-name/li/libxrandr/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + libx11, 8 + libxext, 9 + libxrender, 10 + writeScript, 11 + testers, 12 + }: 13 + stdenv.mkDerivation (finalAttrs: { 14 + pname = "libxrandr"; 15 + version = "1.5.4"; 16 + 17 + outputs = [ 18 + "out" 19 + "dev" 20 + ]; 21 + 22 + src = fetchurl { 23 + url = "mirror://xorg/individual/lib/libXrandr-${finalAttrs.version}.tar.xz"; 24 + hash = "sha256-GtWwZTdfSoWRWqYGEcxkB8BgSSohTX+dryFL51LDtNM="; 25 + }; 26 + 27 + strictDeps = true; 28 + 29 + nativeBuildInputs = [ pkg-config ]; 30 + 31 + buildInputs = [ 32 + xorgproto 33 + libx11 34 + libxext 35 + libxrender 36 + ]; 37 + 38 + propagatedBuildInputs = [ libxrender ]; 39 + 40 + configureFlags = lib.optional ( 41 + stdenv.hostPlatform != stdenv.buildPlatform 42 + ) "--enable-malloc0returnsnull"; 43 + 44 + passthru = { 45 + updateScript = writeScript "update-${finalAttrs.pname}" '' 46 + #!/usr/bin/env nix-shell 47 + #!nix-shell -i bash -p common-updater-scripts 48 + version="$(list-directory-versions --pname libXrandr \ 49 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 50 + | sort -V | tail -n1)" 51 + update-source-version ${finalAttrs.pname} "$version" 52 + ''; 53 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 54 + }; 55 + 56 + meta = { 57 + description = "Xlib Resize, Rotate and Reflection (RandR) extension library"; 58 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxrandr"; 59 + license = lib.licenses.hpndSellVariant; 60 + maintainers = [ ]; 61 + pkgConfigModules = [ "xrandr" ]; 62 + platforms = lib.platforms.unix; 63 + }; 64 + })
+2 -40
pkgs/servers/x11/xorg/default.nix
··· 16 libxdmcp, 17 libxext, 18 libxfixes, 19 libxrender, 20 libxv, 21 lndir, ··· 61 libXdmcp = libxdmcp; 62 libXext = libxext; 63 libXfixes = libxfixes; 64 libXrender = libxrender; 65 libXv = libxv; 66 utilmacros = util-macros; ··· 2496 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2497 meta = { 2498 pkgConfigModules = [ "xpresent" ]; 2499 - platforms = lib.platforms.unix; 2500 - }; 2501 - }) 2502 - ) { }; 2503 - 2504 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2505 - libXrandr = callPackage ( 2506 - { 2507 - stdenv, 2508 - pkg-config, 2509 - fetchurl, 2510 - xorgproto, 2511 - libX11, 2512 - libXext, 2513 - libXrender, 2514 - testers, 2515 - }: 2516 - stdenv.mkDerivation (finalAttrs: { 2517 - pname = "libXrandr"; 2518 - version = "1.5.4"; 2519 - builder = ./builder.sh; 2520 - src = fetchurl { 2521 - url = "mirror://xorg/individual/lib/libXrandr-1.5.4.tar.xz"; 2522 - sha256 = "1lxlqd9ffjr1myfpyk91594n1h07ck6121m6ba8qajjz6xjv1m8s"; 2523 - }; 2524 - hardeningDisable = [ 2525 - "bindnow" 2526 - "relro" 2527 - ]; 2528 - strictDeps = true; 2529 - nativeBuildInputs = [ pkg-config ]; 2530 - buildInputs = [ 2531 - xorgproto 2532 - libX11 2533 - libXext 2534 - libXrender 2535 - ]; 2536 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2537 - meta = { 2538 - pkgConfigModules = [ "xrandr" ]; 2539 platforms = lib.platforms.unix; 2540 }; 2541 })
··· 16 libxdmcp, 17 libxext, 18 libxfixes, 19 + libxrandr, 20 libxrender, 21 libxv, 22 lndir, ··· 62 libXdmcp = libxdmcp; 63 libXext = libxext; 64 libXfixes = libxfixes; 65 + libXrandr = libxrandr; 66 libXrender = libxrender; 67 libXv = libxv; 68 utilmacros = util-macros; ··· 2498 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2499 meta = { 2500 pkgConfigModules = [ "xpresent" ]; 2501 platforms = lib.platforms.unix; 2502 }; 2503 })
+3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 48 $pcMap{"xdmcp"} = "libXdmcp"; 49 $pcMap{"xext"} = "libXext"; 50 $pcMap{"xfixes"} = "libXfixes"; 51 $pcMap{"xrender"} = "libXrender"; 52 $pcMap{"xtrans"} = "xtrans"; 53 $pcMap{"xv"} = "libXv"; ··· 305 libxdmcp, 306 libxext, 307 libxfixes, 308 libxrender, 309 libxv, 310 lndir, ··· 350 libXdmcp = libxdmcp; 351 libXext = libxext; 352 libXfixes = libxfixes; 353 libXrender = libxrender; 354 libXv = libxv; 355 utilmacros = util-macros;
··· 48 $pcMap{"xdmcp"} = "libXdmcp"; 49 $pcMap{"xext"} = "libXext"; 50 $pcMap{"xfixes"} = "libXfixes"; 51 + $pcMap{"xrandr"} = "libXrandr"; 52 $pcMap{"xrender"} = "libXrender"; 53 $pcMap{"xtrans"} = "xtrans"; 54 $pcMap{"xv"} = "libXv"; ··· 306 libxdmcp, 307 libxext, 308 libxfixes, 309 + libxrandr, 310 libxrender, 311 libxv, 312 lndir, ··· 352 libXdmcp = libxdmcp; 353 libXext = libxext; 354 libXfixes = libxfixes; 355 + libXrandr = libxrandr; 356 libXrender = libxrender; 357 libXv = libxv; 358 utilmacros = util-macros;
-9
pkgs/servers/x11/xorg/overrides.nix
··· 344 buildFlags = [ "BITMAP_DEFINES='-DBITMAPDIR=\"/no-such-path\"'" ]; 345 }); 346 347 - libXrandr = super.libXrandr.overrideAttrs (attrs: { 348 - outputs = [ 349 - "out" 350 - "dev" 351 - ]; 352 - configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 353 - propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.libXrender ]; 354 - }); 355 - 356 libSM = super.libSM.overrideAttrs (attrs: { 357 outputs = [ 358 "out"
··· 344 buildFlags = [ "BITMAP_DEFINES='-DBITMAPDIR=\"/no-such-path\"'" ]; 345 }); 346 347 libSM = super.libSM.overrideAttrs (attrs: { 348 outputs = [ 349 "out"
-1
pkgs/servers/x11/xorg/tarballs.list
··· 174 mirror://xorg/individual/lib/libXp-1.0.4.tar.xz 175 mirror://xorg/individual/lib/libXpm-3.5.17.tar.xz 176 mirror://xorg/individual/lib/libXpresent-1.0.1.tar.xz 177 - mirror://xorg/individual/lib/libXrandr-1.5.4.tar.xz 178 mirror://xorg/individual/lib/libXres-1.2.2.tar.xz 179 mirror://xorg/individual/lib/libXScrnSaver-1.2.4.tar.xz 180 mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz
··· 174 mirror://xorg/individual/lib/libXp-1.0.4.tar.xz 175 mirror://xorg/individual/lib/libXpm-3.5.17.tar.xz 176 mirror://xorg/individual/lib/libXpresent-1.0.1.tar.xz 177 mirror://xorg/individual/lib/libXres-1.2.2.tar.xz 178 mirror://xorg/individual/lib/libXScrnSaver-1.2.4.tar.xz 179 mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz