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/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/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/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/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 dab99654eb6e..df84d66f15b6 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -5,7 +5,12 @@ font-alias, font-util, gccmakedep, + ico, imake, + libapplewm, + libdmx, + libfontenc, + libfs, libpciaccess, libpthread-stubs, libx11, @@ -35,7 +40,10 @@ self: with self; { inherit bdftopcf gccmakedep + ico imake + libdmx + libfontenc libpciaccess libxcb libxcvt @@ -50,6 +58,8 @@ self: with self; { ; fontalias = font-alias; fontutil = font-util; + libAppleWM = libapplewm; + libFS = libfs; libpthreadstubs = libpthread-stubs; libX11 = libx11; libXau = libxau; @@ -1697,116 +1707,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 ( - { - 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 ( - { - 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 ( { @@ -2958,80 +2858,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 ( - { - 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 2515d4bd7e24..657b686c1bdc 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -36,7 +36,10 @@ $pcMap{"gl"} = "libGL"; $pcMap{"GL"} = "libGL"; $pcMap{"gbm"} = "libgbm"; $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"; @@ -290,7 +293,12 @@ print OUT <