summary refs log tree commit diff
path: root/pkgs/development/tools/ocaml
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2023-11-09 06:53:36 +0100
committerVincent Laporte <vbgl@users.noreply.github.com>2023-11-16 05:52:57 +0100
commite5b8794184503918a3c8117720cce7da441e7f55 (patch)
treeb4f5c38615153b842485d8c3e39276e5460a5c68 /pkgs/development/tools/ocaml
parent6dd9d9a0fa56dd5017f65cbae6579057714efb91 (diff)
downloadnixpkgs-e5b8794184503918a3c8117720cce7da441e7f55.tar
nixpkgs-e5b8794184503918a3c8117720cce7da441e7f55.tar.gz
nixpkgs-e5b8794184503918a3c8117720cce7da441e7f55.tar.bz2
nixpkgs-e5b8794184503918a3c8117720cce7da441e7f55.tar.lz
nixpkgs-e5b8794184503918a3c8117720cce7da441e7f55.tar.xz
nixpkgs-e5b8794184503918a3c8117720cce7da441e7f55.tar.zst
nixpkgs-e5b8794184503918a3c8117720cce7da441e7f55.zip
ocamlPackages.camlidl: 1.11 → 1.12
Diffstat (limited to 'pkgs/development/tools/ocaml')
-rw-r--r--pkgs/development/tools/ocaml/camlidl/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix
index a97ce8499b2..22104d3d4dc 100644
--- a/pkgs/development/tools/ocaml/camlidl/default.nix
+++ b/pkgs/development/tools/ocaml/camlidl/default.nix
@@ -5,13 +5,13 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.03")
 
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-camlidl";
-  version = "1.11";
+  version = "1.12";
 
   src = fetchFromGitHub {
     owner = "xavierleroy";
     repo = "camlidl";
-    rev = "camlidl111";
-    sha256 = "sha256-8m0zem/6nvpEJtjJNP/+vafeVLlMvNQGdl8lyf/OeBg=";
+    rev = "camlidl112";
+    hash = "sha256-ONPQMDFaU2OzFa5jgMVKx+ZRKk8ZgBZyk42vDvbM7E0=";
   };
 
   nativeBuildInputs = [ ocaml ];
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
     substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out
     substituteInPlace config/Makefile --replace 'OCAMLLIB=$(shell $(OCAMLC) -where)' OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl
     substituteInPlace config/Makefile --replace CPP=cpp CPP=${stdenv.cc}/bin/cpp
+    substituteInPlace lib/Makefile --replace '$(OCAMLLIB)/Makefile.config' "${ocaml}/lib/ocaml/Makefile.config"
     mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/caml
     mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/stublibs
   '';