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

OCaml-4.02: fix ocamlbuild

Browse Source 
This addresses the issue described at http://caml.inria.fr/mantis/view.php?id=6605
This commit is contained in:
Vincent Laporte 2015-06-11 23:59:55 +02:00
parent af3f91085a
commit d440059e7d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/ocaml/4.02.1.nix
View File

@ -9,6 +9,10 @@ assert useX11 -> !stdenv.isArm && !stdenv.isMips;
let let
useNativeCompilers = !stdenv.isMips; useNativeCompilers = !stdenv.isMips;
inherit (stdenv.lib) optionals optionalString; inherit (stdenv.lib) optionals optionalString;
patchOcamlBuild = fetchurl {
url = https://github.com/ocaml/ocaml/pull/117.patch;
sha256 = "0x2cdn2sgzq29qzqg5y2ial0jqy8gjg5a7jf8qqch55dc4vkyjw0";
};
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -24,6 +28,8 @@ stdenv.mkDerivation rec {
sha256 = "1p7lqvh64xpykh99014mz21q8fs3qyjym2qazhhbq8scwldv1i38"; sha256 = "1p7lqvh64xpykh99014mz21q8fs3qyjym2qazhhbq8scwldv1i38";
}; };
patches = [ patchOcamlBuild ];
prefixKey = "-prefix "; prefixKey = "-prefix ";
configureFlags = optionals useX11 [ "-x11lib" x11lib configureFlags = optionals useX11 [ "-x11lib" x11lib
"-x11include" x11inc ]; "-x11include" x11inc ];