Merge: xlibs and x11 attribute cleanup

Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
parent 6b0add86b9 eb09b1fd85
commit 76ef7a93e3
192 changed files with 566 additions and 578 deletions
@@ -51,13 +51,13 @@ rec {

  qgit = import ./qgit {
    inherit fetchurl stdenv;
-    inherit (xlibs) libXext libX11;
+    inherit (xorg) libXext libX11;
    qt = qt4;
  };

  qgitGit = import ./qgit/qgit-git.nix {
    inherit fetchurl sourceFromHead stdenv;
-    inherit (xlibs) libXext libX11;
+    inherit (xorg) libXext libX11;
    qt = qt4;
  };