public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocaml: refactor the useX11 check to actually work

Browse Source
This commit is contained in:
Vladimír Čunát 2014-08-12 21:53:02 +02:00
parent 141b5d961f
commit 08f5932729
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/compilers/ocaml/4.01.0.nix
View File

@ -1,12 +1,16 @@
{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto, let
useX11 ? (!stdenv.isArm && !stdenv.isMips) }: safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips);
in
{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto, useX11 ? safeX11 stdenv }:
if useX11 && !(safeX11 stdenv)
then throw "x11 not available in ocaml with arm or mips arch"
else # let the indentation flow
let let
useNativeCompilers = !stdenv.isMips; useNativeCompilers = !stdenv.isMips;
inherit (stdenv.lib) optionals optionalString; inherit (stdenv.lib) optionals optionalString;
x11Ok = if useX11 && (!stdenv.isArm && !stdenv.isMips)
then throw "x11 not available in ocaml with arm or mips arch"
else true;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {