pyrox.dev / nixpkgs
lol
fork atom

xorg.xorg-server: use the generated expression

... to avoid future surprises. Also add libunwind to deps.
I don't know why libxshmfence is no longer detected.

Vladimír Čunát 801a843b 15f27723

+4 -4
+2 -2
pkgs/servers/x11/xorg/default.nix
··· 2084 2084 url = mirror://xorg/individual/xserver/xorg-server-1.17.2.tar.bz2; 2085 2085 sha256 = "14vr4mm0x94a9bd3sfx9mdh8qhvk48zcml3i8q1wbwi84xhj04gn"; 2086 2086 }; 2087 - 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]; 2088 - }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt xcbutilrenderutil;}; 2087 + buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; 2088 + }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; 2089 2089 2090 2090 xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { 2091 2091 name = "xorg-sgml-doctools-1.11";
+1 -1
pkgs/servers/x11/xorg/overrides.nix
··· 281 281 compositeproto scrnsaverproto resourceproto 282 282 xf86dgaproto 283 283 dmxproto /*libdmx not used*/ xf86vidmodeproto 284 - recordproto libXext pixman libXfont 284 + recordproto libXext pixman libXfont libxshmfence args.libunwind 285 285 damageproto xcmiscproto bigreqsproto 286 286 inputproto xextproto randrproto renderproto presentproto 287 287 dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
+1 -1
pkgs/top-level/all-packages.nix
··· 9392 9392 9393 9393 xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix { 9394 9394 inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig 9395 - libxslt expat libpng zlib perl mesa_drivers spice_protocol 9395 + libxslt expat libpng zlib perl mesa_drivers spice_protocol libunwind 9396 9396 dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook 9397 9397 autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; 9398 9398 inherit (darwin) apple_sdk;