jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add function to build a ghc standalone archive (OSX/iOS only)"

Browse Source 
Partial revert of accidental changes.

This reverts commit 4f9f00fcc9ba5fce1bf476bf3e3200bdbed00f48.
This commit is contained in:
Shea Levy 2017-01-23 18:37:15 -05:00
parent 4f9f00fcc9
commit 46bec22f66
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/compilers/ghc/head.nix
View File

@ -85,17 +85,8 @@ in stdenv.mkDerivation (rec {
} // stdenv.lib.optionalAttrs (cross != null) {
name = "${cross.config}-ghc-${version}";
patches = [ ./ios-linker.patch ];
preConfigure = commonPreConfigure + ''
sed 's|#BuildFlavour = quick-cross|BuildFlavour = quick-cross|' mk/build.mk.sample > mk/build.mk
echo "GhcRtsCcOpts = -glldb -Og" >> mk/build.mk
'';
postUnpack = ''
mkdir -p $out/nix-support
mv $sourceRoot $out/nix-support/source
sourceRoot=$out/nix-support/source
sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk
'';
configureFlags = [
@ -112,8 +103,6 @@ in stdenv.mkDerivation (rec {
dontSetConfigureCross = true;
dontStrip = true;
passthru = {
inherit bootPkgs cross;