libxxf86dga: refactor, move to pkgs/by-name and rename from xorg.libXxf86dga

+62 -42
+57
pkgs/by-name/li/libxxf86dga/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + libX11, 7 + libXext, 8 + xorgproto, 9 + writeScript, 10 + testers, 11 + }: 12 + stdenv.mkDerivation (finalAttrs: { 13 + pname = "libxxf86dga"; 14 + version = "1.1.6"; 15 + 16 + src = fetchurl { 17 + url = "mirror://xorg/individual/lib/libXxf86dga-${finalAttrs.version}.tar.xz"; 18 + hash = "sha256-vkRCdXmAj+OiF9WfUcrnVqJpE+tuTIc4zKtl/1bXmA8="; 19 + }; 20 + 21 + strictDeps = true; 22 + 23 + nativeBuildInputs = [ pkg-config ]; 24 + 25 + buildInputs = [ 26 + libX11 27 + libXext 28 + xorgproto 29 + ]; 30 + 31 + propagatedBuildInputs = [ xorgproto ]; 32 + 33 + configureFlags = lib.optional ( 34 + stdenv.hostPlatform != stdenv.buildPlatform 35 + ) "--enable-malloc0returnsnull"; 36 + 37 + passthru = { 38 + updateScript = writeScript "update-${finalAttrs.pname}" '' 39 + #!/usr/bin/env nix-shell 40 + #!nix-shell -i bash -p common-updater-scripts 41 + version="$(list-directory-versions --pname libXxf86dga \ 42 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 43 + | sort -V | tail -n1)" 44 + update-source-version ${finalAttrs.pname} "$version" 45 + ''; 46 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 47 + }; 48 + 49 + meta = { 50 + description = "Client library for the XFree86-DGA extension"; 51 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxxf86dga"; 52 + license = lib.licenses.x11; 53 + maintainers = [ ]; 54 + pkgConfigModules = [ "xxf86dga" ]; 55 + platforms = lib.platforms.unix; 56 + }; 57 + })
+2 -38
pkgs/servers/x11/xorg/default.nix
··· 25 libxrender, 26 libxv, 27 libxvmc, 28 lndir, 29 luit, 30 makedepend, ··· 101 libXrender = libxrender; 102 libXv = libxv; 103 libXvMC = libxvmc; 104 utilmacros = util-macros; 105 xcbproto = xcb-proto; 106 xkeyboardconfig = xkeyboard-config; ··· 2542 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2543 meta = { 2544 pkgConfigModules = [ "xtst" ]; 2545 - platforms = lib.platforms.unix; 2546 - }; 2547 - }) 2548 - ) { }; 2549 - 2550 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2551 - libXxf86dga = callPackage ( 2552 - { 2553 - stdenv, 2554 - pkg-config, 2555 - fetchurl, 2556 - libX11, 2557 - libXext, 2558 - xorgproto, 2559 - testers, 2560 - }: 2561 - stdenv.mkDerivation (finalAttrs: { 2562 - pname = "libXxf86dga"; 2563 - version = "1.1.6"; 2564 - builder = ./builder.sh; 2565 - src = fetchurl { 2566 - url = "mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz"; 2567 - sha256 = "03wqsxbgyrdbrhw8fk3fxc9nk8jnwz5537ym2yif73w0g5sl4i5y"; 2568 - }; 2569 - hardeningDisable = [ 2570 - "bindnow" 2571 - "relro" 2572 - ]; 2573 - strictDeps = true; 2574 - nativeBuildInputs = [ pkg-config ]; 2575 - buildInputs = [ 2576 - libX11 2577 - libXext 2578 - xorgproto 2579 - ]; 2580 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2581 - meta = { 2582 - pkgConfigModules = [ "xxf86dga" ]; 2583 platforms = lib.platforms.unix; 2584 }; 2585 })
··· 25 libxrender, 26 libxv, 27 libxvmc, 28 + libxxf86dga, 29 lndir, 30 luit, 31 makedepend, ··· 102 libXrender = libxrender; 103 libXv = libxv; 104 libXvMC = libxvmc; 105 + libXxf86dga = libxxf86dga; 106 utilmacros = util-macros; 107 xcbproto = xcb-proto; 108 xkeyboardconfig = xkeyboard-config; ··· 2544 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2545 meta = { 2546 pkgConfigModules = [ "xtst" ]; 2547 platforms = lib.platforms.unix; 2548 }; 2549 })
+3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 57 $pcMap{"xv"} = "libXv"; 58 $pcMap{"xvmc"} = "libXvMC"; 59 $pcMap{"xvmc-wrapper"} = "libXvMC"; 60 $pcMap{"\$PIXMAN"} = "pixman"; 61 $pcMap{"\$RENDERPROTO"} = "xorgproto"; 62 $pcMap{"\$DRI3PROTO"} = "xorgproto"; ··· 320 libxrender, 321 libxv, 322 libxvmc, 323 lndir, 324 luit, 325 makedepend, ··· 396 libXrender = libxrender; 397 libXv = libxv; 398 libXvMC = libxvmc; 399 utilmacros = util-macros; 400 xcbproto = xcb-proto; 401 xkeyboardconfig = xkeyboard-config;
··· 57 $pcMap{"xv"} = "libXv"; 58 $pcMap{"xvmc"} = "libXvMC"; 59 $pcMap{"xvmc-wrapper"} = "libXvMC"; 60 + $pcMap{"xxf86dga"} = "libXxf86dga"; 61 $pcMap{"\$PIXMAN"} = "pixman"; 62 $pcMap{"\$RENDERPROTO"} = "xorgproto"; 63 $pcMap{"\$DRI3PROTO"} = "xorgproto"; ··· 321 libxrender, 322 libxv, 323 libxvmc, 324 + libxxf86dga, 325 lndir, 326 luit, 327 makedepend, ··· 398 libXrender = libxrender; 399 libXv = libxv; 400 libXvMC = libxvmc; 401 + libXxf86dga = libxxf86dga; 402 utilmacros = util-macros; 403 xcbproto = xcb-proto; 404 xkeyboardconfig = xkeyboard-config;
-3
pkgs/servers/x11/xorg/overrides.nix
··· 173 ]; 174 configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 175 }); 176 - libXxf86dga = super.libXxf86dga.overrideAttrs (attrs: { 177 - configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 178 - }); 179 libXxf86misc = super.libXxf86misc.overrideAttrs (attrs: { 180 configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 181 });
··· 173 ]; 174 configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 175 }); 176 libXxf86misc = super.libXxf86misc.overrideAttrs (attrs: { 177 configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 178 });
-1
pkgs/servers/x11/xorg/tarballs.list
··· 163 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 164 mirror://xorg/individual/lib/libXt-1.3.1.tar.xz 165 mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz 166 - mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz 167 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 168 mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz 169 mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz
··· 163 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 164 mirror://xorg/individual/lib/libXt-1.3.1.tar.xz 165 mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz 166 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 167 mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz 168 mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz