From 61b1d30e553048da697e3b755ab099288725ce36 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Sun, 27 Apr 2025 00:13:00 +0200 Subject: [PATCH 1/5] ico: refactor and move to pkgs/by-name from xorg namespace --- pkgs/by-name/ic/ico/package.nix | 51 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 38 +------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 1 - pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 55 insertions(+), 38 deletions(-) create mode 100644 pkgs/by-name/ic/ico/package.nix diff --git a/pkgs/by-name/ic/ico/package.nix b/pkgs/by-name/ic/ico/package.nix new file mode 100644 index 000000000000..ad1f3cd95c88 --- /dev/null +++ b/pkgs/by-name/ic/ico/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + libX11, + xorgproto, + writeScript, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "ico"; + version = "1.0.6"; + + src = fetchurl { + url = "mirror://xorg/individual/app/ico-${finalAttrs.version}.tar.xz"; + hash = "sha256-OPNp1DHnUygP3nD6SJzJTOIE+fjqvS9J/H0yr6afRAU="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libX11 + xorgproto + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/app/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + }; + + meta = { + description = "Simple animation program that may be used for testing various X11 operations and extensions"; + homepage = "https://gitlab.freedesktop.org/xorg/app/ico"; + license = with lib.licenses; [ + x11 + hpnd + hpndSellVariant + ]; + mainProgram = "ico"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index dab99654eb6e..40c84a7e3037 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -5,6 +5,7 @@ font-alias, font-util, gccmakedep, + ico, imake, libpciaccess, libpthread-stubs, @@ -35,6 +36,7 @@ self: with self; { inherit bdftopcf gccmakedep + ico imake libpciaccess libxcb @@ -1697,42 +1699,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - ico = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "ico"; - version = "1.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/ico-1.0.6.tar.xz"; - sha256 = "01a4kykayckxzi4jzggaz3wh9qjcr6f4iykhvq7jhlz767a6kwrq"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libAppleWM = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 2515d4bd7e24..09d6b18544ba 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -290,6 +290,7 @@ print OUT < Date: Sun, 8 Jun 2025 18:06:28 +0200 Subject: [PATCH 2/5] libapplewm: refactor and migrate to pkgs/by-name from xorg.libAppleWM --- pkgs/by-name/li/libapplewm/package.nix | 57 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 10 ---- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 61 insertions(+), 49 deletions(-) create mode 100644 pkgs/by-name/li/libapplewm/package.nix diff --git a/pkgs/by-name/li/libapplewm/package.nix b/pkgs/by-name/li/libapplewm/package.nix new file mode 100644 index 000000000000..82b2ec2a2a6f --- /dev/null +++ b/pkgs/by-name/li/libapplewm/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchFromGitLab, + pkg-config, + autoreconfHook, + util-macros, + xorgproto, + libX11, + libXext, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libapplewm"; + version = "1.4.1-unstable-2021-01-04"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "xorg/lib"; + repo = "libapplewm"; + rev = "be972ebc3a97292e7d2b2350eff55ae12df99a42"; + hash = "sha256-NH9YeOEtnEupqpnsMLC21I+LmCOzT7KnfdzNNWqba/Y="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + util-macros + ]; + + buildInputs = [ + xorgproto + libX11 + libXext + ]; + + passthru = { + # updateScript = # no updatescript since we don't use a tagged release (last one was 14 years ago) + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "Xlib-based library for the Apple-WM extension"; + longDescription = '' + AppleWM is a simple library designed to interface with the Apple-WM extension. + This extension allows X window managers to better interact with the Mac OS X Aqua user + interface when running X11 in a rootless mode. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libapplewm"; + license = lib.licenses.mit; + maintainers = [ ]; + pkgConfigModules = [ "applewm" ]; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 40c84a7e3037..f19a2c418bd7 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -7,6 +7,7 @@ gccmakedep, ico, imake, + libapplewm, libpciaccess, libpthread-stubs, libx11, @@ -52,6 +53,7 @@ self: with self; { ; fontalias = font-alias; fontutil = font-util; + libAppleWM = libapplewm; libpthreadstubs = libpthread-stubs; libX11 = libx11; libXau = libxau; @@ -1699,44 +1701,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libAppleWM = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libX11, - libXext, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libAppleWM"; - version = "be972ebc3a97292e7d2b2350eff55ae12df99a42"; - builder = ./builder.sh; - src = fetchurl { - url = "https://gitlab.freedesktop.org/xorg/lib/libAppleWM/-/archive/be972ebc3a97292e7d2b2350eff55ae12df99a42/libAppleWM-be972ebc3a97292e7d2b2350eff55ae12df99a42.tar.bz2"; - sha256 = "1hrq03pahmrbb05r6a7j7m1nxl65wlfi6d2lwm1kvra63q91f9ph"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libX11 - libXext - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "applewm" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libFS = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 09d6b18544ba..0ee00e602e6d 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -292,6 +292,7 @@ print OUT < Date: Sun, 8 Jun 2025 18:55:36 +0200 Subject: [PATCH 3/5] 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 --- pkgs/by-name/li/libdmx/package.nix | 54 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +------------- .../x11/xorg/generate-expr-from-tarballs.pl | 3 ++ pkgs/servers/x11/xorg/overrides.nix | 3 -- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 59 insertions(+), 42 deletions(-) create mode 100644 pkgs/by-name/li/libdmx/package.nix diff --git a/pkgs/by-name/li/libdmx/package.nix b/pkgs/by-name/li/libdmx/package.nix new file mode 100644 index 000000000000..e0fe0d238dc1 --- /dev/null +++ b/pkgs/by-name/li/libdmx/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libx11, + libxext, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libdmx"; + version = "1.1.5"; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libdmx-${finalAttrs.version}.tar.xz"; + hash = "sha256-NaTiaosLK0/jZEHcpGNkXD+lLSgqw1IFAaOOqULL908="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libx11 + libxext + ]; + + configureFlags = lib.optional ( + stdenv.hostPlatform != stdenv.buildPlatform + ) "--enable-malloc0returnsnull"; + + passthru = { + # updateScript = # libdmx it deprecated and thus needs no updatescript + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "Xlib-based library for the DMX (Distributed Multihead X) extension"; + longDescription = '' + This library allows X11 clients to use the Distributed Multihead X (DMX) Extension, + as previously implemented in the Xdmx server. + X.Org removed support for the Xdmx server from the xorg-server releases in the version 21 + release in 2021. This library is thus now considered deprecated and the version 1.1.5 release + is the last release X.Org plans to make of libdmx. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libdmx"; + license = lib.licenses.mit; + maintainers = [ ]; + pkgConfigModules = [ "dmx" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index f19a2c418bd7..6436f2bf1ddb 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -8,6 +8,7 @@ ico, imake, libapplewm, + libdmx, libpciaccess, libpthread-stubs, libx11, @@ -39,6 +40,7 @@ self: with self; { gccmakedep ico imake + libdmx libpciaccess libxcb libxcvt @@ -2888,44 +2890,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libdmx = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libX11, - libXext, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libdmx"; - version = "1.1.5"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libdmx-1.1.5.tar.xz"; - sha256 = "0kzprd1ak3m3042m5hra50nsagswciis9p21ckilyaqbidmf591m"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libX11 - libXext - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "dmx" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libfontenc = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 0ee00e602e6d..c9be9d636860 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -36,6 +36,7 @@ $pcMap{"gl"} = "libGL"; $pcMap{"GL"} = "libGL"; $pcMap{"gbm"} = "libgbm"; $pcMap{"hwdata"} = "hwdata"; +$pcMap{"dmx"} = "libdmx"; $pcMap{"fontutil"} = "fontutil"; $pcMap{"pciaccess"} = "libpciaccess"; $pcMap{"pthread-stubs"} = "libpthreadstubs"; @@ -293,6 +294,7 @@ print OUT < Date: Sat, 26 Apr 2025 21:33:15 +0200 Subject: [PATCH 4/5] libfontenc: refactor and move to pkgs/by-name from xorg namespace --- pkgs/by-name/li/libfontenc/package.nix | 49 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 38 +------------- .../x11/xorg/generate-expr-from-tarballs.pl | 3 ++ pkgs/servers/x11/xorg/tarballs.list | 1 - 4 files changed, 54 insertions(+), 37 deletions(-) create mode 100644 pkgs/by-name/li/libfontenc/package.nix diff --git a/pkgs/by-name/li/libfontenc/package.nix b/pkgs/by-name/li/libfontenc/package.nix new file mode 100644 index 000000000000..17f4e032f4a3 --- /dev/null +++ b/pkgs/by-name/li/libfontenc/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + zlib, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libfontenc"; + version = "1.1.8"; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libfontenc-${finalAttrs.version}.tar.xz"; + hash = "sha256-ewLD1AUjbg2GgGsd6daGj+YMMTYos4NQsDKRSqT9FMY="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + zlib + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname ${finalAttrs.pname} \ + --url https://xorg.freedesktop.org/releases/individual/lib/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "X font encoding library"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libfontenc"; + license = lib.licenses.mit; + maintainers = [ ]; + pkgConfigModules = [ "fontenc" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6436f2bf1ddb..3eb1113ad451 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -9,6 +9,7 @@ imake, libapplewm, libdmx, + libfontenc, libpciaccess, libpthread-stubs, libx11, @@ -41,6 +42,7 @@ self: with self; { ico imake libdmx + libfontenc libpciaccess libxcb libxcvt @@ -2890,42 +2892,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libfontenc = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - zlib, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libfontenc"; - version = "1.1.8"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libfontenc-1.1.8.tar.xz"; - sha256 = "1ihlznj4m49jn1887cr86qqhrrlghvbfj7bbh230svi30pac60kv"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - zlib - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "fontenc" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libxkbfile = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index c9be9d636860..144a9834b2ea 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -37,6 +37,7 @@ $pcMap{"GL"} = "libGL"; $pcMap{"gbm"} = "libgbm"; $pcMap{"hwdata"} = "hwdata"; $pcMap{"dmx"} = "libdmx"; +$pcMap{"fontenc"} = "libfontenc"; $pcMap{"fontutil"} = "fontutil"; $pcMap{"pciaccess"} = "libpciaccess"; $pcMap{"pthread-stubs"} = "libpthreadstubs"; @@ -295,6 +296,7 @@ print OUT < Date: Sun, 8 Jun 2025 17:05:04 +0200 Subject: [PATCH 5/5] libfs: refactor and migrate to pkgs/by-name from xorg.libFS --- pkgs/by-name/li/libfs/package.nix | 56 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 38 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 3 + pkgs/servers/x11/xorg/overrides.nix | 3 - pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 61 insertions(+), 40 deletions(-) create mode 100644 pkgs/by-name/li/libfs/package.nix diff --git a/pkgs/by-name/li/libfs/package.nix b/pkgs/by-name/li/libfs/package.nix new file mode 100644 index 000000000000..0cc70de9e0d9 --- /dev/null +++ b/pkgs/by-name/li/libfs/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + xtrans, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libfs"; + version = "1.0.10"; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libFS-${finalAttrs.version}.tar.xz"; + hash = "sha256-m6u9PIYGnJhWPaBEBF/cDs5OwMk9zdLGiqdOs0tPO3c="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + xtrans + ]; + + configureFlags = lib.optional ( + stdenv.hostPlatform != stdenv.buildPlatform + ) "--enable-malloc0returnsnull"; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname libFS \ + --url https://xorg.freedesktop.org/releases/individual/lib/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "X Font Service client library"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libfs"; + license = with lib.licenses; [ + mitOpenGroup + hpndSellVariant + ]; + maintainers = [ ]; + pkgConfigModules = [ "libfs" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 3eb1113ad451..df84d66f15b6 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -10,6 +10,7 @@ libapplewm, libdmx, libfontenc, + libfs, libpciaccess, libpthread-stubs, libx11, @@ -58,6 +59,7 @@ self: with self; { fontalias = font-alias; fontutil = font-util; libAppleWM = libapplewm; + libFS = libfs; libpthreadstubs = libpthread-stubs; libX11 = libx11; libXau = libxau; @@ -1705,42 +1707,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libFS = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - xtrans, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libFS"; - version = "1.0.10"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libFS-1.0.10.tar.xz"; - sha256 = "0xrv9x5v6km7ib3d5k9xr704xkhfvigh8i507mb9i706hqybvawv"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - xtrans - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "libfs" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libICE = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 144a9834b2ea..657b686c1bdc 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -39,6 +39,7 @@ $pcMap{"hwdata"} = "hwdata"; $pcMap{"dmx"} = "libdmx"; $pcMap{"fontenc"} = "libfontenc"; $pcMap{"fontutil"} = "fontutil"; +$pcMap{"libfs"} = "libFS"; $pcMap{"pciaccess"} = "libpciaccess"; $pcMap{"pthread-stubs"} = "libpthreadstubs"; $pcMap{"x11"} = "libX11"; @@ -297,6 +298,7 @@ print OUT <