diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-08 00:32:12 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-08 00:32:12 +0000 |
commit | 4b27d2870197b26b7c170caa333944231715d4a3 (patch) | |
tree | 6b781861cb96e9ce0660ca0b904ed3dda1cc6905 /pkgs/development/compilers/ocaml | |
parent | 6e86ca940f9cb7fdbbf8663bc5c19af45fbc1e17 (diff) |
Porting changes from stdenv-updates into this branch. backups/stdenv-updates2@18273
This comes from: svn diff ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff patch -p0 < diff and then adding into svn all files new from the patch. trunk@18255 comes from the last time I updated stdenv-updates from trunk. svn path=/nixpkgs/stdenv-updates2/; revision=18272
Diffstat (limited to 'pkgs/development/compilers/ocaml')
-rw-r--r-- | pkgs/development/compilers/ocaml/3.11.1.nix | 13 | ||||
-rw-r--r-- | pkgs/development/compilers/ocaml/cvs.nix | 31 |
2 files changed, 40 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ocaml/3.11.1.nix b/pkgs/development/compilers/ocaml/3.11.1.nix index f5955c7c78c2f..d7053d583c239 100644 --- a/pkgs/development/compilers/ocaml/3.11.1.nix +++ b/pkgs/development/compilers/ocaml/3.11.1.nix @@ -1,5 +1,10 @@ args: with args; +let + useX11 = (stdenv.system != "armv5tel-linux"); + useNativeCompilers = (stdenv.system != "armv5tel-linux"); + inherit (stdenv.lib) optionals optionalString; +in stdenv.mkDerivation (rec { name = "ocaml-3.11.1"; @@ -10,10 +15,10 @@ stdenv.mkDerivation (rec { }; prefixKey = "-prefix "; - configureFlags = ["-no-tk" "-x11lib" x11]; - buildFlags = "world bootstrap world.opt"; - buildInputs = [x11 ncurses]; - installTargets = "install installopt"; + configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; + buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; + installTargets = "install" + optionalString useNativeCompilers " installopt"; patchPhase = '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang diff --git a/pkgs/development/compilers/ocaml/cvs.nix b/pkgs/development/compilers/ocaml/cvs.nix new file mode 100644 index 0000000000000..475a1d46d5893 --- /dev/null +++ b/pkgs/development/compilers/ocaml/cvs.nix @@ -0,0 +1,31 @@ +args: with args; + +stdenv.mkDerivation (rec { + + name = "ocaml-cvs-2009-09-24"; + + src = fetchcvs { + cvsRoot = ":pserver:anoncvs@camlcvs.inria.fr:/caml"; + module = "ocaml"; + date = "2009-09-24"; + sha256 = "3909bffebc9ce36ca51711d7d95596cba94376ebb1975c6ed46b09c9892c3ef1"; + }; + + prefixKey = "-prefix "; + configureFlags = ["-no-tk"]; + buildFlags = "world" + + (if (stdenv.system != "armv5tel-linux") then "bootstrap world.opt" else ""); + buildInputs = [ncurses]; + installTargets = "install" + (if (stdenv.system != "armv5tel-linux") then "installopt" else ""); + 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"; + }; + +}) |