From d440059e7d828518735134aed8826da5214e6efa Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 11 Jun 2015 23:59:55 +0200 Subject: [PATCH] OCaml-4.02: fix ocamlbuild This addresses the issue described at http://caml.inria.fr/mantis/view.php?id=6605 --- pkgs/development/compilers/ocaml/4.02.1.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/ocaml/4.02.1.nix b/pkgs/development/compilers/ocaml/4.02.1.nix index 6f4cce522e46..d70fe3384e03 100644 --- a/pkgs/development/compilers/ocaml/4.02.1.nix +++ b/pkgs/development/compilers/ocaml/4.02.1.nix @@ -9,6 +9,10 @@ assert useX11 -> !stdenv.isArm && !stdenv.isMips; let useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; + patchOcamlBuild = fetchurl { + url = https://github.com/ocaml/ocaml/pull/117.patch; + sha256 = "0x2cdn2sgzq29qzqg5y2ial0jqy8gjg5a7jf8qqch55dc4vkyjw0"; + }; in stdenv.mkDerivation rec { @@ -24,6 +28,8 @@ stdenv.mkDerivation rec { sha256 = "1p7lqvh64xpykh99014mz21q8fs3qyjym2qazhhbq8scwldv1i38"; }; + patches = [ patchOcamlBuild ]; + prefixKey = "-prefix "; configureFlags = optionals useX11 [ "-x11lib" x11lib "-x11include" x11inc ];