Merge pull request #122792 from TredwellGit/xorg.libXfixes

This commit is contained in:
Sandro 2021-06-14 20:02:40 +02:00 committed by GitHub
commit 5b80702b19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions

View file

@ -846,11 +846,11 @@ lib.makeScope newScope (self: with self; {
}) {};
libXfixes = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation {
name = "libXfixes-5.0.3";
name = "libXfixes-6.0.0";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2";
sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y";
url = "mirror://xorg/individual/lib/libXfixes-6.0.0.tar.bz2";
sha256 = "0k2v4i4r24y3kdr5ici1qqhp69djnja919xfqp54c2rylm6s5hd7";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkg-config ];
@ -2678,15 +2678,15 @@ lib.makeScope newScope (self: with self; {
meta.platforms = lib.platforms.unix;
}) {};
xorgproto = callPackage ({ stdenv, pkg-config, fetchurl, libXt }: stdenv.mkDerivation {
name = "xorgproto-2021.3";
xorgproto = callPackage ({ stdenv, pkg-config, fetchurl, libXt, python3 }: stdenv.mkDerivation {
name = "xorgproto-2021.4";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/proto/xorgproto-2021.3.tar.bz2";
sha256 = "0dypp7cvjf0rvwa7cn1zp7djw5ynhs1rwk9p0r1vczbwzha2nwsc";
url = "mirror://xorg/individual/proto/xorgproto-2021.4.tar.bz2";
sha256 = "1gwz8lhvczjinndrq2jb0swfvhk7p65rprkwiqwlp132041mfl8g";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config python3 ];
buildInputs = [ libXt ];
meta.platforms = lib.platforms.unix;
}) {};

View file

@ -185,7 +185,7 @@ mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2
mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2
mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2
mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2
mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2
mirror://xorg/individual/lib/libXfixes-6.0.0.tar.bz2
mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2
@ -211,7 +211,7 @@ mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2
mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2
mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2
mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz
mirror://xorg/individual/proto/xorgproto-2021.3.tar.bz2
mirror://xorg/individual/proto/xorgproto-2021.4.tar.bz2
mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2
mirror://xorg/individual/util/imake-1.0.8.tar.bz2
mirror://xorg/individual/util/lndir-1.0.3.tar.bz2