tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
ocamlPackages.ppx_cstubs: fix build with ppxlib > 0.30
Vincent Laporte
2 years ago
d52a9683
b0d98140
+24
-2
2 changed files
expand all
collapse all
unified
split
pkgs
development
ocaml-modules
ppx_cstubs
default.nix
ppxlib.patch
+2
-2
pkgs/development/ocaml-modules/ppx_cstubs/default.nix
···
18
19
minimalOCamlVersion = "4.08";
20
21
-
duneVersion = "3";
22
-
23
src = fetchFromGitHub {
24
owner = "fdopen";
25
repo = "ppx_cstubs";
26
rev = version;
27
hash = "sha256-qMmwRWCIfNyhCQYPKLiufnb57sTR3P+WInOqtPDywFs=";
28
};
0
0
29
30
nativeBuildInputs = [ cppo ];
31
···
18
19
minimalOCamlVersion = "4.08";
20
0
0
21
src = fetchFromGitHub {
22
owner = "fdopen";
23
repo = "ppx_cstubs";
24
rev = version;
25
hash = "sha256-qMmwRWCIfNyhCQYPKLiufnb57sTR3P+WInOqtPDywFs=";
26
};
27
+
28
+
patches = [ ./ppxlib.patch ];
29
30
nativeBuildInputs = [ cppo ];
31
+22
pkgs/development/ocaml-modules/ppx_cstubs/ppxlib.patch
···
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
···
1
+
diff --git a/src/internal/ppxc__script_real.ml b/src/internal/ppxc__script_real.ml
2
+
index 392f2a5..d950fc9 100644
3
+
--- a/src/internal/ppxc__script_real.ml
4
+
+++ b/src/internal/ppxc__script_real.ml
5
+
@@ -168,7 +168,7 @@ module C_content_make (E : Empty) = struct
6
+
if cnt = 0 then None else Some (String.concat "\n\n" l)
7
+
end
8
+
9
+
-module C_content_phase0 = C_content_make ()
10
+
+module C_content_phase0 = C_content_make (struct end)
11
+
12
+
module type Const_common_s = sig
13
+
include module type of C_content_phase0
14
+
@@ -300,7 +300,7 @@ module Const_phase0 = struct
15
+
else C_content_phase0.add_extract_source s2 loc exn f
16
+
end
17
+
18
+
-module C_content = C_content_make ()
19
+
+module C_content = C_content_make (struct end)
20
+
21
+
module Const = struct
22
+
include Const_common (C_content)