From 3e72751bd99f1d40760796f34c45e00deef680b6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 22 Feb 2008 12:25:00 +0000
Subject: [PATCH] * ghcboot was broken: the combination of patchelf and strip
 -S generates   broken binaries (NIXPKGS-85).  Worked around by not stripping.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10831
---
 pkgs/development/compilers/ghc/boot.nix |  4 ++++
 pkgs/top-level/build-for-release.nix    | 20 +++++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/ghc/boot.nix b/pkgs/development/compilers/ghc/boot.nix
index ab606d4c2baa..254a9fb855a0 100644
--- a/pkgs/development/compilers/ghc/boot.nix
+++ b/pkgs/development/compilers/ghc/boot.nix
@@ -31,6 +31,10 @@ stdenv.mkDerivation {
         --set-rpath \"${readline}/lib:${ncurses}/lib:${gmp}/lib\" {} \\;
   " else "";
 
+  # Stripping combined with patchelf breaks the executables (they die
+  # with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
+  dontStrip = true;
+
   # The binaries for Darwin use frameworks, so fake those frameworks,
   # and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so
   # that the executables work with no special setup.
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index b2b069d4ca90..9a8390228b16 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -1,4 +1,4 @@
-let {
+let
 
   allPackages = import ./all-packages.nix;
 
@@ -62,7 +62,6 @@ let {
     gcc42
     gdb
     ghc
-    ghc68
     ghostscript
     gimp
     gnugrep
@@ -296,12 +295,11 @@ let {
     ncurses
   ;};
 
-  body = [
-    i686LinuxPkgs
-    x86_64LinuxPkgs
-    i686FreeBSDPkgs
-    powerpcDarwinPkgs
-    i686DarwinPkgs
-    cygwinPkgs
-  ];
-}
+in [
+  i686LinuxPkgs
+  x86_64LinuxPkgs
+  i686FreeBSDPkgs
+  powerpcDarwinPkgs
+  i686DarwinPkgs
+  cygwinPkgs
+]