diff options
| author | Shea Levy <shea@shealevy.com> | 2017-01-23 18:37:15 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2017-01-23 18:37:15 -0500 |
| commit | 46bec22f66ddf26106a5ecf05dc8ce97a7219a6b (patch) | |
| tree | e6cd17105177b06ed8f3ccb2f9ca5816159f7ac2 /pkgs/development/compilers/ghc | |
| parent | 4f9f00fcc9ba5fce1bf476bf3e3200bdbed00f48 (diff) | |
| download | nixlib-46bec22f66ddf26106a5ecf05dc8ce97a7219a6b.tar nixlib-46bec22f66ddf26106a5ecf05dc8ce97a7219a6b.tar.gz nixlib-46bec22f66ddf26106a5ecf05dc8ce97a7219a6b.tar.bz2 nixlib-46bec22f66ddf26106a5ecf05dc8ce97a7219a6b.tar.lz nixlib-46bec22f66ddf26106a5ecf05dc8ce97a7219a6b.tar.xz nixlib-46bec22f66ddf26106a5ecf05dc8ce97a7219a6b.tar.zst nixlib-46bec22f66ddf26106a5ecf05dc8ce97a7219a6b.zip | |
Revert "Add function to build a ghc standalone archive (OSX/iOS only)"
Partial revert of accidental changes. This reverts commit 4f9f00fcc9ba5fce1bf476bf3e3200bdbed00f48.
Diffstat (limited to 'pkgs/development/compilers/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 6ff29d600fc0..971365eda48f 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; |