diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-19 19:09:10 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-19 19:09:10 +0000 |
| commit | e85500987b7df503b37a127a5ea49a07f92e70f0 (patch) | |
| tree | 5f66b5de9aadaf0ff3ba52c394dc0066114e11e2 /pkgs/servers/x11/xorg/overrides.nix | |
| parent | 7ade207f6b75da0fde94cec621ac6d8fa6c3e586 (diff) | |
| parent | 58f543f19f1a2eed8a46202b36a855836cfc9e0f (diff) | |
| download | nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.gz nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.bz2 nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.lz nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.xz nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.tar.zst nixlib-e85500987b7df503b37a127a5ea49a07f92e70f0.zip | |
Merging from trunk. I had to do two manual merges, quite trivial I think.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
Diffstat (limited to 'pkgs/servers/x11/xorg/overrides.nix')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 33bf8e4aa806..5986a937c477 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -100,7 +100,7 @@ [ args.zlib xorg.xf86bigfontproto xorg.glproto args.mesa xorg.xf86driproto xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto xorg.xineramaproto xorg.dri2proto xorg.xf86dgaproto xorg.dmxproto - xorg.libdmx xorg.xf86vidmodeproto + xorg.libdmx xorg.xf86vidmodeproto xorg.libXext ]; propagatedBuildInputs = [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto ]; |