diff --git a/pkgs/by-name/li/libxres/package.nix b/pkgs/by-name/li/libxres/package.nix new file mode 100644 index 000000000000..1dbf4c937f6c --- /dev/null +++ b/pkgs/by-name/li/libxres/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libx11, + libxext, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxres"; + version = "1.2.3"; + outputs = [ + "out" + "dev" + "devdoc" + ]; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libXres-${finalAttrs.version}.tar.xz"; + hash = "sha256-0t6PVAHWyGqJknkWVFR+uN71hd/cDAjMFuJO9q7radw="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libx11 + libxext + ]; + + 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 libXres \ + --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-Resource extension client library"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libxres"; + license = lib.licenses.x11; + maintainers = [ ]; + pkgConfigModules = [ "xres" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 572f15f35773..241955383f00 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -68,6 +68,7 @@ libxpresent, libxrandr, libxrender, + libxres, libxt, libxv, libxvmc, @@ -236,6 +237,7 @@ self: with self; { libXpresent = libxpresent; libXrandr = libxrandr; libXrender = libxrender; + libXres = libxres; libXt = libxt; libXv = libxv; libXvMC = libxvmc; @@ -1055,44 +1057,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libXres = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libX11, - libXext, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libXres"; - version = "1.2.3"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libXres-1.2.3.tar.xz"; - sha256 = "1p39xfpgckp22v60h36wvy2zbpmqgra585krja4nmj6n05a8zpnj"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libX11 - libXext - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "xres" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libXtst = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 3df582b38470..ff662e0f4be9 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -79,6 +79,7 @@ $pcMap{"xpm"} = "libXpm"; $pcMap{"xpresent"} = "libXpresent"; $pcMap{"xrandr"} = "libXrandr"; $pcMap{"xrender"} = "libXrender"; +$pcMap{"xres"} = "libXres"; $pcMap{"xt"} = "libXt"; $pcMap{"xtrans"} = "xtrans"; $pcMap{"xv"} = "libXv"; @@ -393,6 +394,7 @@ print OUT <