libxxf86misc: refactor, move to pkgs/by-name and rename from xorg.libXxf86misc

+62 -42
+57
pkgs/by-name/li/libxxf86misc/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + libx11, 8 + libxext, 9 + writeScript, 10 + testers, 11 + }: 12 + stdenv.mkDerivation (finalAttrs: { 13 + pname = "libxxf86misc"; 14 + version = "1.0.4"; 15 + 16 + src = fetchurl { 17 + url = "mirror://xorg/individual/lib/libXxf86misc-${finalAttrs.version}.tar.bz2"; 18 + hash = "sha256-qJwD4rDxYjnWeiAxuQA/MbWmhhBrvbPHl/uIrkcq84A="; 19 + }; 20 + 21 + strictDeps = true; 22 + 23 + nativeBuildInputs = [ pkg-config ]; 24 + 25 + buildInputs = [ 26 + xorgproto 27 + libx11 28 + libxext 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 libXxf86misc \ 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 = "Extension library for the XFree86-Misc X extension"; 51 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxxf86misc"; 52 + license = lib.licenses.x11; 53 + maintainers = [ ]; 54 + pkgConfigModules = [ "xxf86misc" ]; 55 + platforms = lib.platforms.unix; 56 + }; 57 + })
+2 -38
pkgs/servers/x11/xorg/default.nix
··· 26 26 libxv, 27 27 libxvmc, 28 28 libxxf86dga, 29 + libxxf86misc, 29 30 lndir, 30 31 luit, 31 32 makedepend, ··· 103 104 libXv = libxv; 104 105 libXvMC = libxvmc; 105 106 libXxf86dga = libxxf86dga; 107 + libXxf86misc = libxxf86misc; 106 108 utilmacros = util-macros; 107 109 xcbproto = xcb-proto; 108 110 xkeyboardconfig = xkeyboard-config; ··· 2544 2546 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2545 2547 meta = { 2546 2548 pkgConfigModules = [ "xtst" ]; 2547 - platforms = lib.platforms.unix; 2548 - }; 2549 - }) 2550 - ) { }; 2551 - 2552 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2553 - libXxf86misc = callPackage ( 2554 - { 2555 - stdenv, 2556 - pkg-config, 2557 - fetchurl, 2558 - libX11, 2559 - libXext, 2560 - xorgproto, 2561 - testers, 2562 - }: 2563 - stdenv.mkDerivation (finalAttrs: { 2564 - pname = "libXxf86misc"; 2565 - version = "1.0.4"; 2566 - builder = ./builder.sh; 2567 - src = fetchurl { 2568 - url = "mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2"; 2569 - sha256 = "107k593sx27vjz3v7gbb223add9i7w0bjc90gbb3jqpin3i07758"; 2570 - }; 2571 - hardeningDisable = [ 2572 - "bindnow" 2573 - "relro" 2574 - ]; 2575 - strictDeps = true; 2576 - nativeBuildInputs = [ pkg-config ]; 2577 - buildInputs = [ 2578 - libX11 2579 - libXext 2580 - xorgproto 2581 - ]; 2582 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2583 - meta = { 2584 - pkgConfigModules = [ "xxf86misc" ]; 2585 2549 platforms = lib.platforms.unix; 2586 2550 }; 2587 2551 })
+3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 58 58 $pcMap{"xvmc"} = "libXvMC"; 59 59 $pcMap{"xvmc-wrapper"} = "libXvMC"; 60 60 $pcMap{"xxf86dga"} = "libXxf86dga"; 61 + $pcMap{"xxf86misc"} = "libXxf86misc"; 61 62 $pcMap{"\$PIXMAN"} = "pixman"; 62 63 $pcMap{"\$RENDERPROTO"} = "xorgproto"; 63 64 $pcMap{"\$DRI3PROTO"} = "xorgproto"; ··· 322 323 libxv, 323 324 libxvmc, 324 325 libxxf86dga, 326 + libxxf86misc, 325 327 lndir, 326 328 luit, 327 329 makedepend, ··· 399 401 libXv = libxv; 400 402 libXvMC = libxvmc; 401 403 libXxf86dga = libxxf86dga; 404 + libXxf86misc = libxxf86misc; 402 405 utilmacros = util-macros; 403 406 xcbproto = xcb-proto; 404 407 xkeyboardconfig = xkeyboard-config;
-3
pkgs/servers/x11/xorg/overrides.nix
··· 173 173 ]; 174 174 configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 175 175 }); 176 - libXxf86misc = super.libXxf86misc.overrideAttrs (attrs: { 177 - configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 178 - }); 179 176 libWindowsWM = super.libWindowsWM.overrideAttrs (attrs: { 180 177 configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 181 178 });
-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/libXxf86misc-1.0.4.tar.bz2 167 166 mirror://xorg/individual/lib/libXxf86vm-1.1.6.tar.xz 168 167 mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz 169 168 mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz