Merge commit staging+systemd into closure-size

Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
parent d6dd3b8bd1 33373d939a
commit 5227fb1dd5
6304 changed files with 708451 additions and 130034 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, patchelf, xlibs, openal }:
+{ stdenv, fetchurl, unzip, patchelf, xorg, openal }:

 assert stdenv.isLinux;
 assert stdenv.isx86_64;
@@ -11,7 +11,7 @@ let
      buildInputs = [ unzip patchelf ];

      rtdeps = stdenv.lib.makeLibraryPath
-        [ xlibs.libXxf86vm xlibs.libXext openal ]
+        [ xorg.libXxf86vm xorg.libXext openal ]
        + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.cc ];

      buildCommand =