BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #98748 from TredwellGit/xorg.xorgserver

Browse source 
xorg.xorgserver: 1.20.8 -> 1.20.9
This commit is contained in:
Andreas Rammhold 2020-10-24 00:44:52 +02:00 committed by GitHub
commit f0af7d27b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/servers/x11/xorg/default.nix
View file

@ -2692,11 +2692,11 @@ lib.makeScope newScope (self: with self; {
}) {};
xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
name = "xorg-server-1.20.8";
name = "xorg-server-1.20.9";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/xserver/xorg-server-1.20.8.tar.bz2";
sha256 = "0ih15m7gh1z1ly6z7g82bkni719yisqmbk61a1wgp82bxrmn8yyi";
url = "mirror://xorg/individual/xserver/xorg-server-1.20.9.tar.bz2";
sha256 = "0w9mrnffvjgmwi50kln15i8rpdskxv97r78l75wlcmg4vzhg46g2";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];

10
pkgs/servers/x11/xorg/overrides.nix
View file

@ -642,6 +642,16 @@ self: super:
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
udev
];
# patchPhase is not working, this is a hack but we can remove it in the next xorg-server release
preConfigure = let
# https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067
headerFix = fetchpatch {
url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/919f1f46fc67dae93b2b3f278fcbfc77af34ec58.patch";
sha256 = "0w48rdpl01v0c97n9zdxhf929y76r1f6rqkfs9mfygkz3xcmrfsq";
};
in ''
patch -p1 < ${headerFix}
'';
prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t"
'';

2
pkgs/servers/x11/xorg/tarballs.list
View file

@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.20.8.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.20.9.tar.bz2