From d025d671182c31a04abceb98bded10f9e0864651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Wed, 4 Jun 2008 14:03:20 +0000 Subject: [PATCH] * layout changes svn path=/nixpkgs/trunk/; revision=11980 --- pkgs/development/compilers/ocaml/3.10.0.nix | 47 ++++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index a26175755b5b..8a8ddd7ee975 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -1,23 +1,28 @@ args: with args; -stdenv.mkDerivation rec { - name = "ocaml-3.10.0"; - src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2"; - sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d"; - }; - prefixKey = "-prefix "; - configureFlags = ["-no-tk" "-x11lib" x11]; - buildFlags = "world bootstrap world.opt"; - buildInputs = [x11 ncurses]; - installTargets = "install installopt"; - patchPhase = " - CAT=$(type -tp cat) - sed -e \"s@/bin/cat@\${CAT}@\" -i config/auto-aux/sharpbang - "; - meta = { - homepage = http://caml.inria.fr/ocaml; - license = "QPL, LGPL2 (library part)"; - desctiption = "Most popular variant of the Caml language"; - }; -} +stdenv.mkDerivation (rec { + + name = "ocaml-3.10.0"; + + src = fetchurl { + url = "http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2"; + sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d"; + }; + + prefixKey = "-prefix "; + configureFlags = ["-no-tk" "-x11lib" x11]; + buildFlags = "world bootstrap world.opt"; + buildInputs = [x11 ncurses]; + installTargets = "install installopt"; + patchPhase = '' + CAT=$(type -tp cat) + sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang + ''; + + meta = { + homepage = http://caml.inria.fr/ocaml; + license = "QPL, LGPL2 (library part)"; + desctiption = "Most popular variant of the Caml language"; + }; + +})