summary refs log tree commit diff
path: root/pkgs/servers/x11/xorg/extra.list
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-04-22 21:44:33 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2010-04-22 21:44:33 +0000
commit6f2fac6466cbc684f01093364e60bb96b79c120f (patch)
tree2b0ee90e26a0d6ed8a081351299a66daf35ef9f9 /pkgs/servers/x11/xorg/extra.list
parent6d62947d71342aa29441a720d4eeb2f003126c76 (diff)
parent93d2b4b7bfe5c78e36c93f94a0c057cde04b580f (diff)
downloadnixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar
nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.gz
nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.bz2
nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.lz
nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.xz
nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.zst
nixpkgs-6f2fac6466cbc684f01093364e60bb96b79c120f.zip
Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
Diffstat (limited to 'pkgs/servers/x11/xorg/extra.list')
-rw-r--r--pkgs/servers/x11/xorg/extra.list1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 83118fe0fc4..e930e14e801 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -3,3 +3,4 @@ http://xcb.freedesktop.org/dist/xcb-util-0.3.6.tar.bz2
 http://xcb.freedesktop.org/dist/libxcb-1.4.tar.bz2
 http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
 mirror://xorg/individual/lib/pixman-0.16.4.tar.bz2
+mirror://xorg/individual/app/xdm-1.1.9.tar.bz2