Merge branch stdenv-updates into x-updates

x-updates is supposed to merge after stdenv-updates, so let's test it Conflicts: pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer) pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
parent 0cddd5787f aacca1902c
commit 0d72174dbd
609 changed files with 5410 additions and 7636 deletions
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    sha256 = "eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f";
  };

-  buildNativeInputs = [ pkgconfig perl ];
+  nativeBuildInputs = [ pkgconfig perl ];

  propagatedBuildInputs = [ glib ];