From 46bec22f66ddf26106a5ecf05dc8ce97a7219a6b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 23 Jan 2017 18:37:15 -0500 Subject: [PATCH] Revert "Add function to build a ghc standalone archive (OSX/iOS only)" Partial revert of accidental changes. This reverts commit 4f9f00fcc9ba5fce1bf476bf3e3200bdbed00f48. --- pkgs/development/compilers/ghc/head.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 6ff29d600fc..971365eda48 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -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;