libxxf86vm: refactor, move to pkgs/by-name and rename from xorg.libXxf86vm

+65 -46
+60
pkgs/by-name/li/libxxf86vm/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 = "libxxf86vm"; 14 + version = "1.1.6"; 15 + 16 + outputs = [ 17 + "out" 18 + "dev" 19 + ]; 20 + 21 + src = fetchurl { 22 + url = "mirror://xorg/individual/lib/libXxf86vm-${finalAttrs.version}.tar.xz"; 23 + hash = "sha256-lq9BTHPOHVRJrQS+f58n+oMw+ES23ahD7yLj4b77PuM="; 24 + }; 25 + 26 + strictDeps = true; 27 + 28 + nativeBuildInputs = [ pkg-config ]; 29 + 30 + buildInputs = [ 31 + libX11 32 + libXext 33 + xorgproto 34 + ]; 35 + 36 + configureFlags = lib.optional ( 37 + stdenv.hostPlatform != stdenv.buildPlatform 38 + ) "--enable-malloc0returnsnull"; 39 + 40 + passthru = { 41 + updateScript = writeScript "update-${finalAttrs.pname}" '' 42 + #!/usr/bin/env nix-shell 43 + #!nix-shell -i bash -p common-updater-scripts 44 + version="$(list-directory-versions --pname libXxf86vm \ 45 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 46 + | sort -V | tail -n1)" 47 + update-source-version ${finalAttrs.pname} "$version" 48 + ''; 49 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 50 + }; 51 + 52 + meta = { 53 + description = "Extension library for the XFree86-VidMode X extension"; 54 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxxf86vm"; 55 + license = lib.licenses.x11; 56 + maintainers = [ ]; 57 + pkgConfigModules = [ "xxf86vm" ]; 58 + platforms = lib.platforms.unix; 59 + }; 60 + })
+2 -38
pkgs/servers/x11/xorg/default.nix
··· 27 27 libxvmc, 28 28 libxxf86dga, 29 29 libxxf86misc, 30 + libxxf86vm, 30 31 lndir, 31 32 luit, 32 33 makedepend, ··· 105 106 libXvMC = libxvmc; 106 107 libXxf86dga = libxxf86dga; 107 108 libXxf86misc = libxxf86misc; 109 + libXxf86vm = libxxf86vm; 108 110 utilmacros = util-macros; 109 111 xcbproto = xcb-proto; 110 112 xkeyboardconfig = xkeyboard-config; ··· 2546 2548 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2547 2549 meta = { 2548 2550 pkgConfigModules = [ "xtst" ]; 2549 - platforms = lib.platforms.unix; 2550 - }; 2551 - }) 2552 - ) { }; 2553 - 2554 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2555 - libXxf86vm = callPackage ( 2556 - { 2557 - stdenv, 2558 - pkg-config, 2559 - fetchurl, 2560 - libX11, 2561 - libXext, 2562 - xorgproto, 2563 - testers, 2564 - }: 2565 - stdenv.mkDerivation (finalAttrs: { 2566 - pname = "libXxf86vm"; 2567 - version = "1.1.6"; 2568 - builder = ./builder.sh; 2569 - src = fetchurl { 2570 - url = "mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz"; 2571 - sha256 = "1qryzfzf3qr2xx1sipdn8kw310zs4ygpzgh4mm4m87fffd643bwn"; 2572 - }; 2573 - hardeningDisable = [ 2574 - "bindnow" 2575 - "relro" 2576 - ]; 2577 - strictDeps = true; 2578 - nativeBuildInputs = [ pkg-config ]; 2579 - buildInputs = [ 2580 - libX11 2581 - libXext 2582 - xorgproto 2583 - ]; 2584 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2585 - meta = { 2586 - pkgConfigModules = [ "xxf86vm" ]; 2587 2551 platforms = lib.platforms.unix; 2588 2552 }; 2589 2553 })
+3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 59 59 $pcMap{"xvmc-wrapper"} = "libXvMC"; 60 60 $pcMap{"xxf86dga"} = "libXxf86dga"; 61 61 $pcMap{"xxf86misc"} = "libXxf86misc"; 62 + $pcMap{"xxf86vm"} = "libXxf86vm"; 62 63 $pcMap{"\$PIXMAN"} = "pixman"; 63 64 $pcMap{"\$RENDERPROTO"} = "xorgproto"; 64 65 $pcMap{"\$DRI3PROTO"} = "xorgproto"; ··· 324 325 libxvmc, 325 326 libxxf86dga, 326 327 libxxf86misc, 328 + libxxf86vm, 327 329 lndir, 328 330 luit, 329 331 makedepend, ··· 402 404 libXvMC = libxvmc; 403 405 libXxf86dga = libxxf86dga; 404 406 libXxf86misc = libxxf86misc; 407 + libXxf86vm = libxxf86vm; 405 408 utilmacros = util-macros; 406 409 xcbproto = xcb-proto; 407 410 xkeyboardconfig = xkeyboard-config;
-7
pkgs/servers/x11/xorg/overrides.nix
··· 166 166 configureFlags = lib.optional isDarwin "CFLAGS=-O0"; 167 167 }); 168 168 169 - libXxf86vm = super.libXxf86vm.overrideAttrs (attrs: { 170 - outputs = [ 171 - "out" 172 - "dev" 173 - ]; 174 - configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 175 - }); 176 169 libWindowsWM = super.libWindowsWM.overrideAttrs (attrs: { 177 170 configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 178 171 });
-1
pkgs/servers/x11/xorg/tarballs.list
··· 163 163 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 164 164 mirror://xorg/individual/lib/libXt-1.3.1.tar.xz 165 165 mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz 166 - mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz 167 166 mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz 168 167 mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz