diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-06-16 23:36:02 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-06-16 23:36:11 -0700 |
| commit | e4316b8c17121042fd258df6df2fdbc5618c2b72 (patch) | |
| tree | e4e3cbe0393a2767fc7491e6cf0dbcbed6b0d4d7 /pkgs/servers/x11 | |
| parent | 7d299447ae584bd064ef175fa889607cb387d0c9 (diff) | |
| download | nixpkgs-e4316b8c17121042fd258df6df2fdbc5618c2b72.tar nixpkgs-e4316b8c17121042fd258df6df2fdbc5618c2b72.tar.gz nixpkgs-e4316b8c17121042fd258df6df2fdbc5618c2b72.tar.bz2 nixpkgs-e4316b8c17121042fd258df6df2fdbc5618c2b72.tar.lz nixpkgs-e4316b8c17121042fd258df6df2fdbc5618c2b72.tar.xz nixpkgs-e4316b8c17121042fd258df6df2fdbc5618c2b72.tar.zst nixpkgs-e4316b8c17121042fd258df6df2fdbc5618c2b72.zip | |
xorg-server: 1.16.4 -> 1.17.2
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1d8997e3c1d..f0fdb67f30e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2075,14 +2075,14 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.16.4"; + name = "xorg-server-1.17.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.16.4.tar.bz2; - sha256 = "0wf8xykcjhvpk9ppjcixvf60p6kkyrpmfj0z29d93a8kjb6f3dmb"; + url = mirror://xorg/individual/xserver/xorg-server-1.17.2.tar.bz2; + sha256 = "14vr4mm0x94a9bd3sfx9mdh8qhvk48zcml3i8q1wbwi84xhj04gn"; }; - buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ]; - }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ;}; + buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt xcbutilrenderutil]; + }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt xcbutilrenderutil;}; xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { name = "xorg-sgml-doctools-1.11"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index eaa3055827f..1ef0d88ce3a 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -294,7 +294,7 @@ in libpciaccess inputproto xextproto randrproto renderproto presentproto dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto ]; - commonPatches = [ ./xorgserver-xkbcomp-path.patch ./xorgserver-gcc5.patch ] + commonPatches = [ ./xorgserver-xkbcomp-path.patch ] ++ lib.optional isDarwin ./fix-clang.patch; # XQuartz requires two compilations: the first to get X / XQuartz, # and the second to get Xvfb, Xnest, etc. |