diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-19 09:35:07 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-19 09:35:07 +0200 |
| commit | 801a843bdbca09b045583466bae882e5fdd27014 (patch) | |
| tree | 848dcfdc259b89e3e996f2709d11169bf5bd3522 /pkgs/servers/x11 | |
| parent | 15f27723b3296a970e59d362cccc142791685c36 (diff) | |
| download | nixlib-801a843bdbca09b045583466bae882e5fdd27014.tar nixlib-801a843bdbca09b045583466bae882e5fdd27014.tar.gz nixlib-801a843bdbca09b045583466bae882e5fdd27014.tar.bz2 nixlib-801a843bdbca09b045583466bae882e5fdd27014.tar.lz nixlib-801a843bdbca09b045583466bae882e5fdd27014.tar.xz nixlib-801a843bdbca09b045583466bae882e5fdd27014.tar.zst nixlib-801a843bdbca09b045583466bae882e5fdd27014.zip | |
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.
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 3c0e9195b74e..4e27504f0d23 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2084,8 +2084,8 @@ let 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 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;}; + buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; 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 a7e5b43689a0..2a93dde13040 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -281,7 +281,7 @@ in compositeproto scrnsaverproto resourceproto xf86dgaproto dmxproto /*libdmx not used*/ xf86vidmodeproto - recordproto libXext pixman libXfont + recordproto libXext pixman libXfont libxshmfence args.libunwind damageproto xcmiscproto bigreqsproto inputproto xextproto randrproto renderproto presentproto dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto |