diff options
author | Andres Löh <mail@andres-loeh.de> | 2008-06-04 09:40:17 +0000 |
---|---|---|
committer | Andres Löh <mail@andres-loeh.de> | 2008-06-04 09:40:17 +0000 |
commit | dbddb786ccc40e7cd1d6f7fc77218ae2b56f57da (patch) | |
tree | 57f2c2da2ed4c6f893d92576a9b7cf2c8c3926ba /pkgs | |
parent | 7d0bc40935ab087504c44e6ea74fbe935477d1bc (diff) |
Remove a patch that is no longer used and needed.
svn path=/nixpkgs/trunk/; revision=11968
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/compilers/ghc-6.8/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc-6.8/setup-hook.sh | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc-6.8/x86_64-linux_patch | 24 |
3 files changed, 5 insertions, 26 deletions
diff --git a/pkgs/development/compilers/ghc-6.8/default.nix b/pkgs/development/compilers/ghc-6.8/default.nix index e12778f690be7..5c7b093e3428f 100644 --- a/pkgs/development/compilers/ghc-6.8/default.nix +++ b/pkgs/development/compilers/ghc-6.8/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation (rec { buildInputs = [ghc readline perl m4 gmp]; + # The setup hook is executed by other packages building with ghc. + # It then looks for package configurations that are available and + # build a package database on the fly. setupHook = ./setup-hook.sh; meta = { @@ -23,8 +26,8 @@ stdenv.mkDerivation (rec { configureFlags=[ "--with-gmp-libraries=${gmp}/lib" - "--with-readline-libraries=${readline}/lib" "--with-gmp-includes=${gmp}/include" + "--with-readline-libraries=${readline}/lib" "--with-gcc=${gcc}/bin/gcc" ]; diff --git a/pkgs/development/compilers/ghc-6.8/setup-hook.sh b/pkgs/development/compilers/ghc-6.8/setup-hook.sh index faadc6b860e34..263f46f52d429 100644 --- a/pkgs/development/compilers/ghc-6.8/setup-hook.sh +++ b/pkgs/development/compilers/ghc-6.8/setup-hook.sh @@ -1,6 +1,6 @@ # Support dir for isolating GHC ghc_support=$TMPDIR/ghc-6.8-nix-support -mkdir -p $ghc_support +ensureDir $ghc_support # Create isolated package config packages_db=$ghc_support/package.conf diff --git a/pkgs/development/compilers/ghc-6.8/x86_64-linux_patch b/pkgs/development/compilers/ghc-6.8/x86_64-linux_patch deleted file mode 100644 index 26a9cf2781e49..0000000000000 --- a/pkgs/development/compilers/ghc-6.8/x86_64-linux_patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru /tmp/ghc_fresh/ghc-6.9.20071119/compiler/codeGen/CgUtils.hs ./ghc-6.9.20071119/compiler/codeGen/CgUtils.hs ---- /tmp/ghc_fresh/ghc-6.9.20071119/compiler/codeGen/CgUtils.hs 2007-12-05 15:02:30.000000000 +0100 -+++ ./ghc-6.9.20071119/compiler/codeGen/CgUtils.hs 2007-12-05 15:33:16.000000000 +0100 -@@ -51,7 +51,7 @@ - ) where - - #include "HsVersions.h" --#include "MachRegs.h" -+#include "../includes/MachRegs.h" - - import CgMonad - import TyCon -diff -ru /tmp/ghc_fresh/ghc-6.9.20071119/compiler/nativeGen/MachRegs.lhs ./ghc-6.9.20071119/compiler/nativeGen/MachRegs.lhs ---- /tmp/ghc_fresh/ghc-6.9.20071119/compiler/nativeGen/MachRegs.lhs 2007-12-05 15:02:30.000000000 +0100 -+++ ./ghc-6.9.20071119/compiler/nativeGen/MachRegs.lhs 2007-12-05 15:32:41.000000000 +0100 -@@ -90,7 +90,7 @@ - -- HACK: go for the max - #endif - --#include "MachRegs.h" -+#include "../includes/MachRegs.h" - - import Cmm - import MachOp ( MachRep(..) ) |