Author: maggesi Date: Sat Jan 1 17:26:07 2011 New Revision: 25330 URL: https://svn.nixos.org/websvn/nix/?rev=25330&sc=1
Log: * Fix building of OCaml on Darwin. Gnu sed changed its behavior after version 4.2.1 (bug?), here we add a simple workaround Added: nixpkgs/trunk/pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch Modified: nixpkgs/trunk/pkgs/development/compilers/ocaml/3.11.1.nix Modified: nixpkgs/trunk/pkgs/development/compilers/ocaml/3.11.1.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/compilers/ocaml/3.11.1.nix Sat Jan 1 14:51:53 2011 (r25329) +++ nixpkgs/trunk/pkgs/development/compilers/ocaml/3.11.1.nix Sat Jan 1 17:26:07 2011 (r25330) @@ -18,6 +18,8 @@ # 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"; Added: nixpkgs/trunk/pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch Sat Jan 1 17:26:07 2011 (r25330) @@ -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" _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
