diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-14 20:02:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-14 20:02:40 +0200 |
| commit | 5b80702b1959666622eee7f10d3cdc81217dd724 (patch) | |
| tree | d9b17f136b30e6b77985a91930a68e7607a2479c /pkgs/servers/x11 | |
| parent | c219b5eea449acfbf28bfddf55199125b21364eb (diff) | |
| parent | 8c4b268d270ada04fc9f08e8d0f6018ff2c8253d (diff) | |
| download | nixpkgs-5b80702b1959666622eee7f10d3cdc81217dd724.tar nixpkgs-5b80702b1959666622eee7f10d3cdc81217dd724.tar.gz nixpkgs-5b80702b1959666622eee7f10d3cdc81217dd724.tar.bz2 nixpkgs-5b80702b1959666622eee7f10d3cdc81217dd724.tar.lz nixpkgs-5b80702b1959666622eee7f10d3cdc81217dd724.tar.xz nixpkgs-5b80702b1959666622eee7f10d3cdc81217dd724.tar.zst nixpkgs-5b80702b1959666622eee7f10d3cdc81217dd724.zip | |
Merge pull request #122792 from TredwellGit/xorg.libXfixes
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index bf7e462cbd3..fbfbb86a5e0 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -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; }) {}; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index b44eebe6409..4154100015f 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -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 |