libdmx: refactor and migrate to pkgs/by-name from xorg namespace

libdmx has been deprecated by upstream, but I can't remove it yet because xdpyinfo still depends on it

Zitrone e1ebdea2 7c2537d7

+59 -42
+54
pkgs/by-name/li/libdmx/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + libx11, 8 + libxext, 9 + testers, 10 + }: 11 + stdenv.mkDerivation (finalAttrs: { 12 + pname = "libdmx"; 13 + version = "1.1.5"; 14 + 15 + src = fetchurl { 16 + url = "mirror://xorg/individual/lib/libdmx-${finalAttrs.version}.tar.xz"; 17 + hash = "sha256-NaTiaosLK0/jZEHcpGNkXD+lLSgqw1IFAaOOqULL908="; 18 + }; 19 + 20 + strictDeps = true; 21 + 22 + nativeBuildInputs = [ pkg-config ]; 23 + 24 + buildInputs = [ 25 + xorgproto 26 + libx11 27 + libxext 28 + ]; 29 + 30 + configureFlags = lib.optional ( 31 + stdenv.hostPlatform != stdenv.buildPlatform 32 + ) "--enable-malloc0returnsnull"; 33 + 34 + passthru = { 35 + # updateScript = # libdmx it deprecated and thus needs no updatescript 36 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 37 + }; 38 + 39 + meta = { 40 + description = "Xlib-based library for the DMX (Distributed Multihead X) extension"; 41 + longDescription = '' 42 + This library allows X11 clients to use the Distributed Multihead X (DMX) Extension, 43 + as previously implemented in the Xdmx server. 44 + X.Org removed support for the Xdmx server from the xorg-server releases in the version 21 45 + release in 2021. This library is thus now considered deprecated and the version 1.1.5 release 46 + is the last release X.Org plans to make of libdmx. 47 + ''; 48 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libdmx"; 49 + license = lib.licenses.mit; 50 + maintainers = [ ]; 51 + pkgConfigModules = [ "dmx" ]; 52 + platforms = lib.platforms.unix; 53 + }; 54 + })
+2 -38
pkgs/servers/x11/xorg/default.nix
··· 8 8 ico, 9 9 imake, 10 10 libapplewm, 11 + libdmx, 11 12 libpciaccess, 12 13 libpthread-stubs, 13 14 libx11, ··· 39 40 gccmakedep 40 41 ico 41 42 imake 43 + libdmx 42 44 libpciaccess 43 45 libxcb 44 46 libxcvt ··· 2883 2885 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2884 2886 meta = { 2885 2887 pkgConfigModules = [ "xxf86vm" ]; 2886 - platforms = lib.platforms.unix; 2887 - }; 2888 - }) 2889 - ) { }; 2890 - 2891 - # THIS IS A GENERATED FILE. DO NOT EDIT! 2892 - libdmx = callPackage ( 2893 - { 2894 - stdenv, 2895 - pkg-config, 2896 - fetchurl, 2897 - xorgproto, 2898 - libX11, 2899 - libXext, 2900 - testers, 2901 - }: 2902 - stdenv.mkDerivation (finalAttrs: { 2903 - pname = "libdmx"; 2904 - version = "1.1.5"; 2905 - builder = ./builder.sh; 2906 - src = fetchurl { 2907 - url = "mirror://xorg/individual/lib/libdmx-1.1.5.tar.xz"; 2908 - sha256 = "0kzprd1ak3m3042m5hra50nsagswciis9p21ckilyaqbidmf591m"; 2909 - }; 2910 - hardeningDisable = [ 2911 - "bindnow" 2912 - "relro" 2913 - ]; 2914 - strictDeps = true; 2915 - nativeBuildInputs = [ pkg-config ]; 2916 - buildInputs = [ 2917 - xorgproto 2918 - libX11 2919 - libXext 2920 - ]; 2921 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 2922 - meta = { 2923 - pkgConfigModules = [ "dmx" ]; 2924 2888 platforms = lib.platforms.unix; 2925 2889 }; 2926 2890 })
+3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 36 36 $pcMap{"GL"} = "libGL"; 37 37 $pcMap{"gbm"} = "libgbm"; 38 38 $pcMap{"hwdata"} = "hwdata"; 39 + $pcMap{"dmx"} = "libdmx"; 39 40 $pcMap{"fontutil"} = "fontutil"; 40 41 $pcMap{"pciaccess"} = "libpciaccess"; 41 42 $pcMap{"pthread-stubs"} = "libpthreadstubs"; ··· 293 294 ico, 294 295 imake, 295 296 libapplewm, 297 + libdmx, 296 298 libpciaccess, 297 299 libpthread-stubs, 298 300 libx11, ··· 324 326 gccmakedep 325 327 ico 326 328 imake 329 + libdmx 327 330 libpciaccess 328 331 libxcb 329 332 libxcvt
-3
pkgs/servers/x11/xorg/overrides.nix
··· 179 179 libXxf86misc = super.libXxf86misc.overrideAttrs (attrs: { 180 180 configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 181 181 }); 182 - libdmx = super.libdmx.overrideAttrs (attrs: { 183 - configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 184 - }); 185 182 libFS = super.libFS.overrideAttrs (attrs: { 186 183 configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 187 184 });
-1
pkgs/servers/x11/xorg/tarballs.list
··· 153 153 mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz 154 154 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz 155 155 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz 156 - mirror://xorg/individual/lib/libdmx-1.1.5.tar.xz 157 156 mirror://xorg/individual/lib/libfontenc-1.1.8.tar.xz 158 157 mirror://xorg/individual/lib/libFS-1.0.10.tar.xz 159 158 mirror://xorg/individual/lib/libICE-1.1.2.tar.xz