xlibs: replace occurrences by xorg

This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
This commit is contained in:
Vladimír Čunát
2015-09-15 12:54:34 +02:00
parent 21e3ff658a
commit 88c9f8b574
117 changed files with 406 additions and 406 deletions
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, glib, xlibs, cairo, gtk}:
{ fetchurl, stdenv, glib, xorg, cairo, gtk}:
let
libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo];
libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo];
in
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";