libfs: refactor and migrate to pkgs/by-name from xorg.libFS

Zitrone 60fd3304 e234ad4b

+61 -40
+56
pkgs/by-name/li/libfs/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchurl, 5 + pkg-config, 6 + xorgproto, 7 + xtrans, 8 + writeScript, 9 + testers, 10 + }: 11 + stdenv.mkDerivation (finalAttrs: { 12 + pname = "libfs"; 13 + version = "1.0.10"; 14 + 15 + src = fetchurl { 16 + url = "mirror://xorg/individual/lib/libFS-${finalAttrs.version}.tar.xz"; 17 + hash = "sha256-m6u9PIYGnJhWPaBEBF/cDs5OwMk9zdLGiqdOs0tPO3c="; 18 + }; 19 + 20 + strictDeps = true; 21 + 22 + nativeBuildInputs = [ pkg-config ]; 23 + 24 + buildInputs = [ 25 + xorgproto 26 + xtrans 27 + ]; 28 + 29 + configureFlags = lib.optional ( 30 + stdenv.hostPlatform != stdenv.buildPlatform 31 + ) "--enable-malloc0returnsnull"; 32 + 33 + passthru = { 34 + updateScript = writeScript "update-${finalAttrs.pname}" '' 35 + #!/usr/bin/env nix-shell 36 + #!nix-shell -i bash -p common-updater-scripts 37 + version="$(list-directory-versions --pname libFS \ 38 + --url https://xorg.freedesktop.org/releases/individual/lib/ \ 39 + | sort -V | tail -n1)" 40 + update-source-version ${finalAttrs.pname} "$version" 41 + ''; 42 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 43 + }; 44 + 45 + meta = { 46 + description = "X Font Service client library"; 47 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libfs"; 48 + license = with lib.licenses; [ 49 + mitOpenGroup 50 + hpndSellVariant 51 + ]; 52 + maintainers = [ ]; 53 + pkgConfigModules = [ "libfs" ]; 54 + platforms = lib.platforms.unix; 55 + }; 56 + })
+2 -36
pkgs/servers/x11/xorg/default.nix
··· 10 10 libapplewm, 11 11 libdmx, 12 12 libfontenc, 13 + libfs, 13 14 libpciaccess, 14 15 libpthread-stubs, 15 16 libx11, ··· 58 59 fontalias = font-alias; 59 60 fontutil = font-util; 60 61 libAppleWM = libapplewm; 62 + libFS = libfs; 61 63 libpthreadstubs = libpthread-stubs; 62 64 libX11 = libx11; 63 65 libXau = libxau; ··· 1700 1702 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 1701 1703 meta = { 1702 1704 pkgConfigModules = [ ]; 1703 - platforms = lib.platforms.unix; 1704 - }; 1705 - }) 1706 - ) { }; 1707 - 1708 - # THIS IS A GENERATED FILE. DO NOT EDIT! 1709 - libFS = callPackage ( 1710 - { 1711 - stdenv, 1712 - pkg-config, 1713 - fetchurl, 1714 - xorgproto, 1715 - xtrans, 1716 - testers, 1717 - }: 1718 - stdenv.mkDerivation (finalAttrs: { 1719 - pname = "libFS"; 1720 - version = "1.0.10"; 1721 - builder = ./builder.sh; 1722 - src = fetchurl { 1723 - url = "mirror://xorg/individual/lib/libFS-1.0.10.tar.xz"; 1724 - sha256 = "0xrv9x5v6km7ib3d5k9xr704xkhfvigh8i507mb9i706hqybvawv"; 1725 - }; 1726 - hardeningDisable = [ 1727 - "bindnow" 1728 - "relro" 1729 - ]; 1730 - strictDeps = true; 1731 - nativeBuildInputs = [ pkg-config ]; 1732 - buildInputs = [ 1733 - xorgproto 1734 - xtrans 1735 - ]; 1736 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 1737 - meta = { 1738 - pkgConfigModules = [ "libfs" ]; 1739 1705 platforms = lib.platforms.unix; 1740 1706 }; 1741 1707 })
+3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 39 39 $pcMap{"dmx"} = "libdmx"; 40 40 $pcMap{"fontenc"} = "libfontenc"; 41 41 $pcMap{"fontutil"} = "fontutil"; 42 + $pcMap{"libfs"} = "libFS"; 42 43 $pcMap{"pciaccess"} = "libpciaccess"; 43 44 $pcMap{"pthread-stubs"} = "libpthreadstubs"; 44 45 $pcMap{"x11"} = "libX11"; ··· 297 298 libapplewm, 298 299 libdmx, 299 300 libfontenc, 301 + libfs, 300 302 libpciaccess, 301 303 libpthread-stubs, 302 304 libx11, ··· 345 347 fontalias = font-alias; 346 348 fontutil = font-util; 347 349 libAppleWM = libapplewm; 350 + libFS = libfs; 348 351 libpthreadstubs = libpthread-stubs; 349 352 libX11 = libx11; 350 353 libXau = libxau;
-3
pkgs/servers/x11/xorg/overrides.nix
··· 179 179 libXxf86misc = super.libXxf86misc.overrideAttrs (attrs: { 180 180 configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 181 181 }); 182 - libFS = super.libFS.overrideAttrs (attrs: { 183 - configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag; 184 - }); 185 182 libWindowsWM = super.libWindowsWM.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/libFS-1.0.10.tar.xz 157 156 mirror://xorg/individual/lib/libICE-1.1.2.tar.xz 158 157 mirror://xorg/individual/lib/libSM-1.2.6.tar.xz 159 158 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2