Merge branch 'pi-stdenv-updates' of https://github.com/viric/nixpkgs into pi-stdenv-updates

2012-12-28 21:21:24 +01:00
parent 4485ee5916 719ba63004
commit c4cc88aca2
417 changed files with 838 additions and 853 deletions
@@ -39,7 +39,7 @@ stdenv.mkDerivation ({
  inherit kernelHeaders installLocales;

  # The host/target system.
-  crossConfig = if (cross != null) then cross.config else null;
+  crossConfig = if cross != null then cross.config else null;

  inherit (stdenv) is64bit;