alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

ocaml: fix x11 include and lib parameters for configure script

Browse source 
Close #2923, fixes #2922.
This commit is contained in:
drozv 2014-06-12 21:46:59 -04:00 committed by Vladimír Čunát
parent 8c50807c4d
commit 33fec9d04d
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/compilers/ocaml/4.01.0.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, x11 }: { stdenv, fetchurl, ncurses, buildEnv, libX11, xproto }:
let let
useX11 = !stdenv.isArm && !stdenv.isMips; useX11 = !stdenv.isArm && !stdenv.isMips;
@ -8,6 +8,10 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; };
x11lib = x11env + "/lib";
x11inc = x11env + "/include";
name = "ocaml-4.01.0"; name = "ocaml-4.01.0";
src = fetchurl { src = fetchurl {
@ -16,9 +20,11 @@ stdenv.mkDerivation rec {
}; };
prefixKey = "-prefix "; prefixKey = "-prefix ";
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ]; configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11lib
"-x11include" x11inc ];
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildInputs = [ncurses] ++ optionals useX11 [ x11 ]; buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ];
installTargets = "install" + optionalString useNativeCompilers " installopt"; installTargets = "install" + optionalString useNativeCompilers " installopt";
preConfigure = '' preConfigure = ''
CAT=$(type -tp cat) CAT=$(type -tp cat)