ghc: build GHC on haskellPlatforms instead of linux++darwin to avoid evaluation errors on Hydra because x86_64-darwin is unsupported
svn path=/nixpkgs/trunk/; revision=27799
This commit is contained in:
parent
c58754b390
commit
66dbd40cb7
@ -100,5 +100,5 @@ stdenv.mkDerivation rec {
|
|||||||
[ $(./main) == "yes" ]
|
[ $(./main) == "yes" ]
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta.platforms = [ "i686-darwin" "x86_64-linux" "i686-linux"] ;
|
meta.platforms = stdenv.lib.platforms.haskellPlatforms;
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||||||
stdenv.lib.maintainers.marcweber
|
stdenv.lib.maintainers.marcweber
|
||||||
stdenv.lib.maintainers.andres
|
stdenv.lib.maintainers.andres
|
||||||
];
|
];
|
||||||
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
|
platforms = stdenv.lib.platforms.haskellPlatforms;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||||||
stdenv.lib.maintainers.marcweber
|
stdenv.lib.maintainers.marcweber
|
||||||
stdenv.lib.maintainers.andres
|
stdenv.lib.maintainers.andres
|
||||||
];
|
];
|
||||||
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
|
platforms = stdenv.lib.platforms.haskellPlatforms;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||||||
stdenv.lib.maintainers.marcweber
|
stdenv.lib.maintainers.marcweber
|
||||||
stdenv.lib.maintainers.andres
|
stdenv.lib.maintainers.andres
|
||||||
];
|
];
|
||||||
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
|
platforms = stdenv.lib.platforms.haskellPlatforms;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user