From 9a69f9a4b509c8b29f69e7f676d116c5db578131 Mon Sep 17 00:00:00 2001 From: maggesi Date: Sat, 1 Jan 2011 17:26:07 +0000 Subject: [PATCH] * Fix building of OCaml on Darwin. Gnu sed changed its behavior after version 4.2.1 (bug?), here we add a simple workaround git-svn-id: https://svn.nixos.org/repos/nix/nixpkgs/trunk@25330 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb --- pkgs/development/compilers/ocaml/3.11.1.nix | 2 ++ pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch diff --git a/pkgs/development/compilers/ocaml/3.11.1.nix b/pkgs/development/compilers/ocaml/3.11.1.nix index 60dc51575..0add40dcd 100644 --- a/pkgs/development/compilers/ocaml/3.11.1.nix +++ b/pkgs/development/compilers/ocaml/3.11.1.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { # Needed to avoid a SIGBUS on the final executable on mips NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else ""; + patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ]; + prefixKey = "-prefix "; configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; diff --git a/pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch b/pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch new file mode 100644 index 000000000..dc2bcb869 --- /dev/null +++ b/pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch @@ -0,0 +1,9 @@ +diff -Nuar ocaml-3.11.1/ocamldoc/remove_DEBUG ocaml-3.11.1-nixpkgs/ocamldoc/remove_DEBUG +--- ocaml-3.11.1/ocamldoc/remove_DEBUG 2004-04-15 18:18:52.000000000 +0200 ++++ ocaml-3.11.1-nixpkgs/ocamldoc/remove_DEBUG 2011-01-01 17:37:07.000000000 +0100 +@@ -18,4 +18,4 @@ + # respecting the cpp # line annotation conventions + + echo "# 1 \"$1\"" +-LC_ALL=C sed -e '/DEBUG/s/.*//' "$1" ++grep -v 'DEBUG' "$1" -- 2.11.4.GIT