From 9ad3a410d24b53f1b023548fd88ec7d99e3e432c Mon Sep 17 00:00:00 2001 From: Zitrone Date: Sun, 8 Jun 2025 20:55:14 +0200 Subject: [PATCH 1/5] libxv: refactor and migrate to pkgs/by-name from xorg.libXv --- pkgs/by-name/li/libxv/package.nix | 64 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +----------- .../x11/xorg/generate-expr-from-tarballs.pl | 3 + pkgs/servers/x11/xorg/overrides.nix | 9 --- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 69 insertions(+), 48 deletions(-) create mode 100644 pkgs/by-name/li/libxv/package.nix diff --git a/pkgs/by-name/li/libxv/package.nix b/pkgs/by-name/li/libxv/package.nix new file mode 100644 index 000000000000..df8cd9625aaa --- /dev/null +++ b/pkgs/by-name/li/libxv/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libX11, + libXext, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxv"; + version = "1.0.13"; + + outputs = [ + "out" + "dev" + "devdoc" + ]; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libXv-${finalAttrs.version}.tar.xz"; + hash = "sha256-fTSRCVjhwfjRk9go/qG32hkilygKNUN68GkvADugN1U="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libX11 + libXext + ]; + + 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 libXv \ + --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 = "Xlib-based library for the X Video (Xv) extension to the X Window System"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxv"; + license = with lib.licenses; [ + hpnd + hpndSellVariant + ]; + maintainers = [ ]; + pkgConfigModules = [ "xv" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index dab99654eb6e..8cdb225e101a 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -14,6 +14,7 @@ libxcvt, libxdmcp, libxext, + libxv, lndir, luit, makedepend, @@ -55,6 +56,7 @@ self: with self; { libXau = libxau; libXdmcp = libxdmcp; libXext = libxext; + libXv = libxv; utilmacros = util-macros; xcbproto = xcb-proto; xkeyboardconfig = xkeyboard-config; @@ -2763,44 +2765,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libXv = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libX11, - libXext, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libXv"; - version = "1.0.13"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXv-1.0.13.tar.xz"; - sha256 = "0m9pl0xh0bv9y1x46d8a52bj46fsnyhzwa6qjg8zihg1b04r2d3x"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libX11 - libXext - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xv" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libXvMC = 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..4028e5a126c8 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -47,6 +47,7 @@ $pcMap{"xcb-proto"} = "xcbproto"; $pcMap{"xdmcp"} = "libXdmcp"; $pcMap{"xext"} = "libXext"; $pcMap{"xtrans"} = "xtrans"; +$pcMap{"xv"} = "libXv"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "xorgproto"; $pcMap{"\$DRI3PROTO"} = "xorgproto"; @@ -299,6 +300,7 @@ print OUT < Date: Sun, 8 Jun 2025 22:58:52 +0200 Subject: [PATCH 2/5] libxfixes: refactor and migrate to pkgs/by-name from xorg.libXfixes --- pkgs/by-name/li/libxfixes/package.nix | 57 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 38 +------------ .../x11/xorg/generate-expr-from-tarballs.pl | 3 + pkgs/servers/x11/xorg/overrides.nix | 7 --- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 62 insertions(+), 44 deletions(-) create mode 100644 pkgs/by-name/li/libxfixes/package.nix diff --git a/pkgs/by-name/li/libxfixes/package.nix b/pkgs/by-name/li/libxfixes/package.nix new file mode 100644 index 000000000000..cf51e21d9d1e --- /dev/null +++ b/pkgs/by-name/li/libxfixes/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libX11, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxfixes"; + version = "6.0.1"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libXfixes-${finalAttrs.version}.tar.xz"; + hash = "sha256-tpX5PNJJlCGrAtInREWOZQzMiMHUyBMNYCACE6vALVg="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libX11 + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname libXfixes \ + --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 = "Xlib-based library for the XFIXES Extension"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxfixes"; + license = with lib.licenses; [ + hpndSellVariant + mit + ]; + maintainers = [ ]; + pkgConfigModules = [ "xfixes" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 8cdb225e101a..4af533466d2a 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -14,6 +14,7 @@ libxcvt, libxdmcp, libxext, + libxfixes, libxv, lndir, luit, @@ -56,6 +57,7 @@ self: with self; { libXau = libxau; libXdmcp = libxdmcp; libXext = libxext; + libXfixes = libxfixes; libXv = libxv; utilmacros = util-macros; xcbproto = xcb-proto; @@ -2162,42 +2164,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libXfixes = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libX11, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libXfixes"; - version = "6.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXfixes-6.0.1.tar.xz"; - sha256 = "0n1dq2mi60i0c06i7j6lq64cq335ir2l89yj0amj3529s8ygk5dn"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libX11 - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xfixes" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libXfont = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 4028e5a126c8..1ac98976b4c6 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -46,6 +46,7 @@ $pcMap{"xbitmaps"} = "xbitmaps"; $pcMap{"xcb-proto"} = "xcbproto"; $pcMap{"xdmcp"} = "libXdmcp"; $pcMap{"xext"} = "libXext"; +$pcMap{"xfixes"} = "libXfixes"; $pcMap{"xtrans"} = "xtrans"; $pcMap{"xv"} = "libXv"; $pcMap{"\$PIXMAN"} = "pixman"; @@ -300,6 +301,7 @@ print OUT < Date: Sun, 8 Jun 2025 23:09:09 +0200 Subject: [PATCH 3/5] libxrender: refactor and migrate to pkgs/by-name from xorg.libXrender --- pkgs/by-name/li/libxrender/package.nix | 61 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 38 +----------- .../x11/xorg/generate-expr-from-tarballs.pl | 3 + pkgs/servers/x11/xorg/overrides.nix | 10 --- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 66 insertions(+), 47 deletions(-) create mode 100644 pkgs/by-name/li/libxrender/package.nix diff --git a/pkgs/by-name/li/libxrender/package.nix b/pkgs/by-name/li/libxrender/package.nix new file mode 100644 index 000000000000..c38fb008845f --- /dev/null +++ b/pkgs/by-name/li/libxrender/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libx11, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxrender"; + version = "0.9.12"; + + outputs = [ + "out" + "dev" + "doc" + ]; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libXrender-${finalAttrs.version}.tar.xz"; + hash = "sha256-uDISjaSLOcjWCCJEgXQ0A60Wkb9OVU5L6cF03xcdG5c="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libx11 + ]; + + propagatedBuildInputs = [ xorgproto ]; + + 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 libXrender \ + --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 = "Xlib library for the Render Extension to the X11 protocol"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxrender"; + license = lib.licenses.hpndSellVariant; + maintainers = [ ]; + pkgConfigModules = [ "xrender" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 4af533466d2a..39b840db9307 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -15,6 +15,7 @@ libxdmcp, libxext, libxfixes, + libxrender, libxv, lndir, luit, @@ -58,6 +59,7 @@ self: with self; { libXdmcp = libxdmcp; libXext = libxext; libXfixes = libxfixes; + libXrender = libxrender; libXv = libxv; utilmacros = util-macros; xcbproto = xcb-proto; @@ -2577,42 +2579,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libXrender = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libX11, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libXrender"; - version = "0.9.12"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXrender-0.9.12.tar.xz"; - sha256 = "15qv3lbxyx61x55lwmafpy8idb836is82i1213bchfcblj6i4cmq"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libX11 - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xrender" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libXres = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 1ac98976b4c6..073baffba74b 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -47,6 +47,7 @@ $pcMap{"xcb-proto"} = "xcbproto"; $pcMap{"xdmcp"} = "libXdmcp"; $pcMap{"xext"} = "libXext"; $pcMap{"xfixes"} = "libXfixes"; +$pcMap{"xrender"} = "libXrender"; $pcMap{"xtrans"} = "xtrans"; $pcMap{"xv"} = "libXv"; $pcMap{"\$PIXMAN"} = "pixman"; @@ -302,6 +303,7 @@ print OUT < Date: Sun, 8 Jun 2025 23:51:03 +0200 Subject: [PATCH 4/5] libxcursor: refactor and migrate to pkgs/by-name from xorg.libXcursor --- pkgs/by-name/li/libxcursor/package.nix | 58 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 42 +------------- .../x11/xorg/generate-expr-from-tarballs.pl | 3 + pkgs/servers/x11/xorg/overrides.nix | 7 --- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 63 insertions(+), 48 deletions(-) create mode 100644 pkgs/by-name/li/libxcursor/package.nix diff --git a/pkgs/by-name/li/libxcursor/package.nix b/pkgs/by-name/li/libxcursor/package.nix new file mode 100644 index 000000000000..0a7cbcbfe3a5 --- /dev/null +++ b/pkgs/by-name/li/libxcursor/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libx11, + libxfixes, + libxrender, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxcursor"; + version = "1.2.3"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libXcursor-${finalAttrs.version}.tar.xz"; + hash = "sha256-/elALdTP552nHi2Wu5gK/F5v9Pin10wVnhlmr7KywsA="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libx11 + libxfixes + libxrender + ]; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname libXcursor \ + --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 = "X11 Cursor management library"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcursor"; + license = lib.licenses.hpndSellVariant; + maintainers = [ ]; + pkgConfigModules = [ "xcursor" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 39b840db9307..348d0c7a4db5 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -12,6 +12,7 @@ libxau, libxcb, libxcvt, + libxcursor, libxdmcp, libxext, libxfixes, @@ -56,6 +57,7 @@ self: with self; { libpthreadstubs = libpthread-stubs; libX11 = libx11; libXau = libxau; + libXcursor = libxcursor; libXdmcp = libxdmcp; libXext = libxext; libXfixes = libxfixes; @@ -2088,46 +2090,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libXcursor = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libX11, - libXfixes, - libXrender, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libXcursor"; - version = "1.2.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXcursor-1.2.3.tar.xz"; - sha256 = "1h62narayrhrkqalrmx7z3s6yppw1acbp5id3skrvrygshnl1sgx"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libX11 - libXfixes - libXrender - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xcursor" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libXdamage = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 073baffba74b..58e4a71397dc 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -44,6 +44,7 @@ $pcMap{"x11-xcb"} = "libX11"; $pcMap{"xau"} = "libXau"; $pcMap{"xbitmaps"} = "xbitmaps"; $pcMap{"xcb-proto"} = "xcbproto"; +$pcMap{"xcursor"} = "libXcursor"; $pcMap{"xdmcp"} = "libXdmcp"; $pcMap{"xext"} = "libXext"; $pcMap{"xfixes"} = "libXfixes"; @@ -300,6 +301,7 @@ print OUT < Date: Mon, 9 Jun 2025 00:02:46 +0200 Subject: [PATCH 5/5] libxrandr: refactor and migrate to pkgs/by-name from xorg.libXrandr --- pkgs/by-name/li/libxrandr/package.nix | 64 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 42 +----------- .../x11/xorg/generate-expr-from-tarballs.pl | 3 + pkgs/servers/x11/xorg/overrides.nix | 9 --- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 69 insertions(+), 50 deletions(-) create mode 100644 pkgs/by-name/li/libxrandr/package.nix diff --git a/pkgs/by-name/li/libxrandr/package.nix b/pkgs/by-name/li/libxrandr/package.nix new file mode 100644 index 000000000000..93a575ce705b --- /dev/null +++ b/pkgs/by-name/li/libxrandr/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libx11, + libxext, + libxrender, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxrandr"; + version = "1.5.4"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libXrandr-${finalAttrs.version}.tar.xz"; + hash = "sha256-GtWwZTdfSoWRWqYGEcxkB8BgSSohTX+dryFL51LDtNM="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libx11 + libxext + libxrender + ]; + + propagatedBuildInputs = [ libxrender ]; + + 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 libXrandr \ + --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 = "Xlib Resize, Rotate and Reflection (RandR) extension library"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxrandr"; + license = lib.licenses.hpndSellVariant; + maintainers = [ ]; + pkgConfigModules = [ "xrandr" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 348d0c7a4db5..b5062bf24e0f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -16,6 +16,7 @@ libxdmcp, libxext, libxfixes, + libxrandr, libxrender, libxv, lndir, @@ -61,6 +62,7 @@ self: with self; { libXdmcp = libxdmcp; libXext = libxext; libXfixes = libxfixes; + libXrandr = libxrandr; libXrender = libxrender; libXv = libxv; utilmacros = util-macros; @@ -2501,46 +2503,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libXrandr = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libX11, - libXext, - libXrender, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libXrandr"; - version = "1.5.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXrandr-1.5.4.tar.xz"; - sha256 = "1lxlqd9ffjr1myfpyk91594n1h07ck6121m6ba8qajjz6xjv1m8s"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libX11 - libXext - libXrender - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xrandr" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libXres = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 58e4a71397dc..3a85296e2596 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -48,6 +48,7 @@ $pcMap{"xcursor"} = "libXcursor"; $pcMap{"xdmcp"} = "libXdmcp"; $pcMap{"xext"} = "libXext"; $pcMap{"xfixes"} = "libXfixes"; +$pcMap{"xrandr"} = "libXrandr"; $pcMap{"xrender"} = "libXrender"; $pcMap{"xtrans"} = "xtrans"; $pcMap{"xv"} = "libXv"; @@ -305,6 +306,7 @@ print OUT <