diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-10-28 17:23:23 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-10-28 17:23:23 +0000 |
| commit | 9709716036b7b99553c1a62bd691d5f371ebab40 (patch) | |
| tree | 4ec5c2b568761a2257ba6a8e30e5a4535aa9dfa8 | |
| parent | 2c7a0d91a539000a8616c03252f6895e949c9bb8 (diff) | |
Making ocaml choose between only bytecode or native compilers, and disablingbackups/armv5tel-linux@18007
X11 in arm.
It isn't that X11 doesn't work in arm... it should be a getConfig I think.
I should improve this in a later commit.
svn path=/nixpkgs/branches/armv5tel-linux/; revision=18005
| -rw-r--r-- | pkgs/development/compilers/ocaml/3.11.1.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/compilers/ocaml/3.11.1.nix b/pkgs/development/compilers/ocaml/3.11.1.nix index 744f29748df6..d7053d583c23 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,11 +15,10 @@ stdenv.mkDerivation (rec { }; 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 ""); + 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 |